summaryrefslogtreecommitdiff
path: root/des.cpp
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2015-08-03 04:33:57 -0400
committerJeffrey Walton <noloader@gmail.com>2015-08-03 04:33:57 -0400
commitc8860d6fa984af1c306b9605b8bff6e032d9701c (patch)
tree4118262d89ae82e1d412934290e60f7254356720 /des.cpp
parent491e8dbd74d871001337d5ac1c6d6d2bca69c6b9 (diff)
downloadcryptopp-git-c8860d6fa984af1c306b9605b8bff6e032d9701c.tar.gz
Cleared "register is deprecated" warning on OS X with ancient versions of the C++ runtime library
Diffstat (limited to 'des.cpp')
-rw-r--r--des.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/des.cpp b/des.cpp
index d85ba6fc..9ba91d2f 100644
--- a/des.cpp
+++ b/des.cpp
@@ -279,8 +279,10 @@ void RawDES::RawSetKey(CipherDir dir, const byte *key)
byte *const pcr=pc1m+56; /* place to rotate pc1 into */
byte *const ks=pcr+56;
- // C++11 deprecated register
-#if !defined(CRYPTOPP_CXX11)
+ // C++11 deprecated register. Don't pivot on CRYPTOPP_CXX11 because
+ // configure.h unsets the macro on some Apple platforms if it
+ // detects an ancient version.
+#if (__cplusplus < 201103L)
register int i,j,l;
#else
int i,j,l;