[Boost-commit] svn:boost r57843 - in trunk/boost: . config/compiler

Subject: [Boost-commit] svn:boost r57843 - in trunk/boost: . config/compiler
From: john_at_[hidden]
Date: 2009-11-22 11:38:05

Author: johnmaddock
Date: 2009-11-22 11:38:05 EST (Sun, 22 Nov 2009)
New Revision: 57843
URL: http://svn.boost.org/trac/boost/changeset/57843

Log:
Fix preprocessor logic for long long support.
Fixes #3657.
Fixes #3568.
Text files modified: 
   trunk/boost/config/compiler/visualc.hpp |     2 +-                                      
   trunk/boost/integer_fwd.hpp             |     2 +-                                      
   2 files changed, 2 insertions(+), 2 deletions(-)

Modified: trunk/boost/config/compiler/visualc.hpp
==============================================================================
--- trunk/boost/config/compiler/visualc.hpp	(original)
+++ trunk/boost/config/compiler/visualc.hpp	2009-11-22 11:38:05 EST (Sun, 22 Nov 2009)
@@ -125,7 +125,7 @@
 #if (_MSC_VER >= 1200)
 #   define BOOST_HAS_MS_INT64
 #endif
-#if (_MSC_VER >= 1310) && defined(_MSC_EXTENSIONS)
+#if (_MSC_VER >= 1310) && (defined(_MSC_EXTENSIONS) || (_MSC_VER >= 1500))
 #   define BOOST_HAS_LONG_LONG
 #else
 #   define BOOST_NO_LONG_LONG

Modified: trunk/boost/integer_fwd.hpp
==============================================================================
--- trunk/boost/integer_fwd.hpp	(original)
+++ trunk/boost/integer_fwd.hpp	2009-11-22 11:38:05 EST (Sun, 22 Nov 2009)
@@ -65,7 +65,7 @@
 template <  >
     class integer_traits< unsigned long >;
 
-#ifdef ULLONG_MAX
+#if !defined(BOOST_NO_INTEGRAL_INT64_T) && !defined(BOOST_NO_INT64_T) && defined(BOOST_HAS_LONG_LONG)
 template <  >
     class integer_traits<  ::boost::long_long_type>;