[Boost-commit] svn:boost r48970 - trunk/boost/archive

Subject: [Boost-commit] svn:boost r48970 - trunk/boost/archive
From: ramey_at_[hidden]
Date: 2008-09-26 02:32:49

Author: ramey
Date: 2008-09-26 02:32:48 EDT (Fri, 26 Sep 2008)
New Revision: 48970
URL: http://svn.boost.org/trac/boost/changeset/48970

Log:
Refined detection of intrinsic 64 bit integers for platforms with long long
Text files modified: 
   trunk/boost/archive/polymorphic_iarchive.hpp |    18 +++++++++++-------                      
   trunk/boost/archive/polymorphic_oarchive.hpp |    18 +++++++++++-------                      
   2 files changed, 22 insertions(+), 14 deletions(-)

Modified: trunk/boost/archive/polymorphic_iarchive.hpp
==============================================================================
--- trunk/boost/archive/polymorphic_iarchive.hpp	(original)
+++ trunk/boost/archive/polymorphic_iarchive.hpp	2008-09-26 02:32:48 EDT (Fri, 26 Sep 2008)
@@ -42,13 +42,17 @@
 #if defined(BOOST_NO_INT64_T)
     #define BOOST_NO_INTRINSIC_INT64_T
 #else 
-    #if defined(ULONG_MAX)
-        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
-            #define BOOST_NO_INTRINSIC_INT64_T
-        #endif
-    #else 
-        #define BOOST_NO_INTRINSIC_INT64_T
-    #endif
+    #if defined(ULLONG_MAX)  
+        #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #elif defined(ULONG_MAX)  
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #else   
+        #define BOOST_NO_INTRINSIC_INT64_T  
+    #endif  
 #endif
 
 namespace boost {

Modified: trunk/boost/archive/polymorphic_oarchive.hpp
==============================================================================
--- trunk/boost/archive/polymorphic_oarchive.hpp	(original)
+++ trunk/boost/archive/polymorphic_oarchive.hpp	2008-09-26 02:32:48 EDT (Fri, 26 Sep 2008)
@@ -41,13 +41,17 @@
 #if defined(BOOST_NO_INT64_T)
     #define BOOST_NO_INTRINSIC_INT64_T
 #else 
-    #if defined(ULONG_MAX)
-        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1
-            #define BOOST_NO_INTRINSIC_INT64_T
-        #endif
-    #else 
-        #define BOOST_NO_INTRINSIC_INT64_T
-    #endif
+    #if defined(ULLONG_MAX)  
+        #if(ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #elif defined(ULONG_MAX)  
+        #if(ULONG_MAX != 0xffffffff && ULONG_MAX == 18446744073709551615ul) // 2**64 - 1  
+            #define BOOST_NO_INTRINSIC_INT64_T  
+        #endif  
+    #else   
+        #define BOOST_NO_INTRINSIC_INT64_T  
+    #endif  
 #endif
 
 namespace boost {