From a396085bc015c0a81fd346d72e4c43ba889274a5 Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Sat, 4 Sep 2004 10:34:49 +0000
Subject: [PATCH] Added new types boost::long_long_type and
 boost::ulong_long_type in boost/config.hpp and applied these types in place
 of "long long" throughout.  As a result, almost all of boost now compiles
 cleanly with -ansi -pedantic with gcc.  Changes tested with gcc 3.3, 2.95,
 VC7.1 and Intel 8.

[SVN r24899]
---
 include/boost/iterator/counting_iterator.hpp | 4 ++--
 test/counting_iterator_test.cpp              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/iterator/counting_iterator.hpp b/include/boost/iterator/counting_iterator.hpp
index ce597d6..7b772ed 100644
--- a/include/boost/iterator/counting_iterator.hpp
+++ b/include/boost/iterator/counting_iterator.hpp
@@ -57,11 +57,11 @@ namespace detail
 
 #  if defined(BOOST_HAS_LONG_LONG)
   template <>
-  struct is_numeric<long long>
+  struct is_numeric< ::boost::long_long_type>
     : mpl::true_ {};
   
   template <>
-  struct is_numeric<unsigned long long>
+  struct is_numeric< ::boost::ulong_long_type>
     : mpl::true_ {};
 #  endif
 
diff --git a/test/counting_iterator_test.cpp b/test/counting_iterator_test.cpp
index 5122867..c30a3e0 100644
--- a/test/counting_iterator_test.cpp
+++ b/test/counting_iterator_test.cpp
@@ -270,8 +270,8 @@ int main()
     test_integer<long>();
     test_integer<unsigned long>();
 #if defined(BOOST_HAS_LONG_LONG)
-    test_integer<long long>();
-    test_integer<unsigned long long>();
+    test_integer< ::boost::long_long_type>();
+    test_integer< ::boost::ulong_long_type>();
 #endif
 
     // Test user-defined type.