forked from Mirrors/openclonk
Stop checking for nullptr
We're already requiring the compiler to implement C++11, so checking for nullptr support again is useless.shapetextures
parent
a9bf9bfc36
commit
9f03209ed7
|
@ -71,7 +71,6 @@ if(USE_GCC_STD_0X)
|
|||
endif()
|
||||
|
||||
REQUIRE_CXX_SOURCE_COMPILES("#include <memory>\nint main() { std::unique_ptr<int> a; std::shared_ptr<int> b; }" HAVE_C11_SMART_PTRS)
|
||||
CHECK_CXX_SOURCE_COMPILES("int main() { void *d = nullptr; }" HAVE_NULLPTR)
|
||||
REQUIRE_CXX_SOURCE_COMPILES("int main() { static_assert(true, \"\"); }" HAVE_STATIC_ASSERT)
|
||||
CHECK_CXX_SOURCE_COMPILES("#include <memory>\nint main() { auto a = std::make_unique<int>(0); }" HAVE_MAKE_UNIQUE)
|
||||
REQUIRE_CXX_SOURCE_COMPILES("template<class... T> class C; int main() { return 0; }" HAVE_VARIADIC_TEMPLATES)
|
||||
|
|
|
@ -25,9 +25,6 @@
|
|||
/* Define to 1 if your stdlib has std::make_unique */
|
||||
#cmakedefine HAVE_MAKE_UNIQUE 1
|
||||
|
||||
/* Define to 1 if you have support for nullptr. */
|
||||
#cmakedefine HAVE_NULLPTR 1
|
||||
|
||||
/* Define to 1 if you have the <poll.h> header file. */
|
||||
#cmakedefine HAVE_POLL_H 1
|
||||
|
||||
|
|
|
@ -74,10 +74,8 @@
|
|||
|
||||
|
||||
// C++0x nullptr
|
||||
#ifdef HAVE_NULLPTR
|
||||
#undef NULL
|
||||
#define NULL nullptr
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue