[Boost-commit] svn:boost r39363 - trunk/boost

From: dgregor_at_[hidden]
Date: 2007-09-18 08:10:32

Author: dgregor
Date: 2007-09-18 08:09:53 EDT (Tue, 18 Sep 2007)
New Revision: 39363
URL: http://svn.boost.org/trac/boost/changeset/39363

Log:
Second attempt at fixing usage of 64-bit integer type
Text files modified: 
   trunk/boost/concept_check.hpp |    23 +++++++++--------------                 
   1 files changed, 9 insertions(+), 14 deletions(-)

Modified: trunk/boost/concept_check.hpp
==============================================================================
--- trunk/boost/concept_check.hpp	(original)
+++ trunk/boost/concept_check.hpp	2007-09-18 08:09:53 EDT (Tue, 18 Sep 2007)
@@ -81,12 +81,13 @@
   template <> struct Integer<unsigned int> {};
   template <> struct Integer<long> {};
   template <> struct Integer<unsigned long> {};
-  // etc.
-
-#ifdef _WIN64
+# if defined(BOOST_HAS_LONG_LONG)
+  template <> struct Integer< ::boost::long_long_type> {};
+  template <> struct Integer< ::boost::ulong_long_type> {};
+# elif defined(BOOST_HAS_MS_INT64)
   template <> struct Integer<__int64> {};
   template <> struct Integer<unsigned __int64> {};
-#endif
+# endif
 
   BOOST_concept(SignedInteger,(T)) {
 #if BOOST_WORKAROUND(__GNUC__, <= 3)
@@ -104,11 +105,9 @@
   template <> struct SignedInteger<long> {};
 # if defined(BOOST_HAS_LONG_LONG)
   template <> struct SignedInteger< ::boost::long_long_type> {};
-  // etc.
-#endif      
-#ifdef _WIN64
+# elif defined(BOOST_HAS_MS_INT64)
   template <> struct SignedInteger<__int64> {};
-#endif
+# endif      
 
   BOOST_concept(UnsignedInteger,(T)) {
 #if BOOST_WORKAROUND(__GNUC__, <= 3)
@@ -127,13 +126,9 @@
   template <> struct UnsignedInteger<unsigned long> {};
 # if defined(BOOST_HAS_LONG_LONG)
   template <> struct UnsignedInteger< ::boost::ulong_long_type> {};
-  // etc.
-#endif      
-#ifdef _WIN64
+# elif defined(BOOST_HAS_MS_INT64)
   template <> struct UnsignedInteger<unsigned __int64> {};
-#endif
-
-  // etc.
+# endif
 
   //===========================================================================
   // Basic Concepts