diff options
| -rw-r--r-- | include/gsl/pointers | 5 | ||||
| -rw-r--r-- | tests/notnull_tests.cpp | 61 |
2 files changed, 66 insertions, 0 deletions
diff --git a/include/gsl/pointers b/include/gsl/pointers index 69499d6..a338856 100644 --- a/include/gsl/pointers +++ b/include/gsl/pointers @@ -120,6 +120,11 @@ private: }; template <class T> +auto make_not_null(T&& t) { + return gsl::not_null<std::remove_cv_t<std::remove_reference_t<T>>>{std::forward<T>(t)}; +} + +template <class T> std::ostream& operator<<(std::ostream& os, const not_null<T>& val) { os << val.get(); diff --git a/tests/notnull_tests.cpp b/tests/notnull_tests.cpp index e522fb5..673eab8 100644 --- a/tests/notnull_tests.cpp +++ b/tests/notnull_tests.cpp @@ -19,6 +19,8 @@ // so people aren't annoyed by them when running the tool. #pragma warning(disable : 26440 26426) // from catch +// Fix VS2015 build breaks in Release +#pragma warning(disable : 4702) // unreachable code #endif #include <catch/catch.hpp> // for AssertionHandler, StringRef, CHECK, TEST_... @@ -32,6 +34,8 @@ #include <string> // for basic_string, operator==, string, operator<< #include <typeinfo> // for type_info + + namespace gsl { struct fail_fast; } // namespace gsl @@ -416,4 +420,61 @@ TEST_CASE("TestNotNullConstructorTypeDeduction") } #endif // #if defined(__cplusplus) && (__cplusplus >= 201703L) +TEST_CASE("TestMakeNotNull") +{ + { + int i = 42; + + const auto x = make_not_null(&i); + helper(make_not_null(&i)); + helper_const(make_not_null(&i)); + + CHECK(*x == 42); + } + + { + int i = 42; + int* p = &i; + + const auto x = make_not_null(p); + helper(make_not_null(p)); + helper_const(make_not_null(p)); + + CHECK(*x == 42); + } + + { + const auto workaround_macro = []() { + int* p1 = nullptr; + const auto x = make_not_null(p1); + CHECK(*x == 42); + }; + CHECK_THROWS_AS(workaround_macro(), fail_fast); + } + + { + const auto workaround_macro = []() { + const int* p1 = nullptr; + const auto x = make_not_null(p1); + CHECK(*x == 42); + }; + CHECK_THROWS_AS(workaround_macro(), fail_fast); + } + + { + int* p = nullptr; + + CHECK_THROWS_AS(helper(make_not_null(p)), fail_fast); + CHECK_THROWS_AS(helper_const(make_not_null(p)), fail_fast); + } + +#ifdef CONFIRM_COMPILATION_ERRORS + { + CHECK_THROWS_AS(make_not_null(nullptr), fail_fast); + CHECK_THROWS_AS(helper(make_not_null(nullptr)), fail_fast); + CHECK_THROWS_AS(helper_const(make_not_null(nullptr)), fail_fast); + } +#endif +} + static_assert(std::is_nothrow_move_constructible<not_null<void *>>::value, "not_null must be no-throw move constructible"); |