summaryrefslogtreecommitdiff
path: root/config.h
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2018-11-22 19:44:41 -0500
committerJeffrey Walton <noloader@gmail.com>2018-11-22 19:44:41 -0500
commit3ba4dc60521c916996cc4a99cfd27cbc38c62897 (patch)
treefc138ad7695d46a1f58434fdac87702d2b5df0f2 /config.h
parent652d0e42bfa221b33acbf9f389592ea2e1d07fed (diff)
downloadcryptopp-git-3ba4dc60521c916996cc4a99cfd27cbc38c62897.tar.gz
Use __IBMCPP_NULLPTR from IBM compiler manual
Diffstat (limited to 'config.h')
-rw-r--r--config.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.h b/config.h
index e7b1bb36..9b6d2472 100644
--- a/config.h
+++ b/config.h
@@ -1156,7 +1156,8 @@ NAMESPACE_END
// nullptr_t: MS at VS2010 (16.00); GCC at 4.6; Clang at 3.3; Intel 10.0; SunCC 5.13.
#if (CRYPTOPP_MSC_VERSION >= 1600) || __has_feature(cxx_nullptr) || \
- (__INTEL_COMPILER >= 1000) || (CRYPTOPP_GCC_VERSION >= 40600) || (__SUNPRO_CC >= 0x5130)
+ (__INTEL_COMPILER >= 1000) || (CRYPTOPP_GCC_VERSION >= 40600) || \
+ (__SUNPRO_CC >= 0x5130) || defined(__IBMCPP_NULLPTR)
# define CRYPTOPP_CXX11_NULLPTR 1
#endif // nullptr_t compilers