Skip to content

refactor: not_null constexpr in debug builds #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codethinki merged 2 commits into from
Oct 16, 2026
Merged

refactor: not_null constexpr in debug builds #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58f16b8
refactor: not_null constexpr in debug builds
codethinki Oct 16, 2026
e5ae82c
leave cthm alone, a separate PR removes it
codethinki Oct 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cth/incl/cth/constants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@
#define CTH_DEBUG_INLINE_IMPL(code) { code }

#define CTH_RELEASE_NOEXCEPT noexcept(false)
#define CTH_RELEASE_CONSTEXPR
#else
#define CTH_DEBUG_IMPL = default;
#define CTH_DEBUG_INLINE_IMPL(code) \
{}

#define CTH_RELEASE_NOEXCEPT noexcept(true)
#define CTH_RELEASE_CONSTEXPR constexpr
#endif
#include <cstdint>

Expand Down
4 changes: 2 additions & 2 deletions cth/incl/cth/ptr/not_null.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ class not_null {
static constexpr bool NOEXCEPT_CHECK_VAL = COMPILATION_MODE != CompilationMode::DEBUG;
static constexpr bool RELEASE_VAL_NOEXCEPT = NOEXCEPT_ASSIGN && NOEXCEPT_MOVE_CTOR;

static CTH_RELEASE_CONSTEXPR void checkVal(T const& obj) noexcept(NOEXCEPT_CHECK_VAL) {
static constexpr void checkVal(T const& obj) noexcept(NOEXCEPT_CHECK_VAL) {
CTH_CRITICAL(obj == Null, "obj must not be Null") {}
}

public:
CTH_RELEASE_CONSTEXPR not_null(T obj) noexcept(NOEXCEPT_MOVE_CTOR && NOEXCEPT_CHECK_VAL) :
constexpr not_null(T obj) noexcept(NOEXCEPT_MOVE_CTOR && NOEXCEPT_CHECK_VAL) :
_obj{std::move(obj)} { not_null::checkVal(_obj); }

template<class U> requires(std::convertible_to<U, T> && !std::same_as<U, T>)
Expand Down
8 changes: 8 additions & 0 deletions cth/tests/src/pointers/not_null_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ struct TestStruct {
auto const data = std::make_unique<TestStruct>(EXAMPLE_NUMBER); // NOLINT(cert-err58-cpp)


CTH_TEST(not_null, constexpr) {
static_assert([] {
not_null<int const*> const ptr{&EXAMPLE_NUMBER};
not_null<int const*> const copy{ptr};
return *copy;
}() == EXAMPLE_NUMBER);
}

CTH_TEST(not_null, comparison) {
int a = EXAMPLE_NUMBER;
int b = EXAMPLE_NUMBER;
Expand Down
Loading