diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2018-01-23 18:07:33 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-01-24 19:11:06 (GMT) |
| commit | 7a75657084c518a39b192c7ee1568588944677af (patch) | |
| tree | e425d65299f889b6e5d71be8c21bf3d236cdde85 /Configure.hxx.in | |
| parent | 86399e49398cc9e8028e280eee3e89992ab3fd11 (diff) | |
| download | CMake-7a75657084c518a39b192c7ee1568588944677af.zip CMake-7a75657084c518a39b192c7ee1568588944677af.tar.gz CMake-7a75657084c518a39b192c7ee1568588944677af.tar.bz2 | |
KWSys 2018-01-23 (0579db1c)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
3e807fd6 cmake: specify source file extensions
Brad King (1):
38855ca1 Set CMP0042 explicitly with CMake 3.0 and above
Chuck Atkins (1):
4ca97fc6 SystemTools: Disable getpwnam for static linux builds
Hans Johnson (1):
7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code
Sankhesh Jhaveri (1):
20c458d0 Set CMP0022 policy to new to provide link interface definitions
Sean McBride (1):
c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes
luz.paz (1):
4b67f965 Remove superfluous double whitespace in appropriate places
Diffstat (limited to 'Configure.hxx.in')
| -rw-r--r-- | Configure.hxx.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Configure.hxx.in b/Configure.hxx.in index 1e67874..05afc7d 100644 --- a/Configure.hxx.in +++ b/Configure.hxx.in @@ -20,6 +20,12 @@ #define @KWSYS_NAMESPACE@__has_cpp_attribute(x) 0 #endif +#if __cplusplus >= 201103L +#define @KWSYS_NAMESPACE@_NULLPTR nullptr +#else +#define @KWSYS_NAMESPACE@_NULLPTR 0 +#endif + #ifndef @KWSYS_NAMESPACE@_FALLTHROUGH #if __cplusplus >= 201703L && @KWSYS_NAMESPACE@__has_cpp_attribute(fallthrough) #define @KWSYS_NAMESPACE@_FALLTHROUGH [[fallthrough]] @@ -48,6 +54,7 @@ #define KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H \ @KWSYS_NAMESPACE@_CXX_HAS_EXT_STDIO_FILEBUF_H #define KWSYS_FALLTHROUGH @KWSYS_NAMESPACE@_FALLTHROUGH +#define KWSYS_NULLPTR @KWSYS_NAMESPACE@_NULLPTR #endif #endif |