From b5cd8c537f17a1dd2ad4e3735ecfd1861b44a372 Mon Sep 17 00:00:00 2001
From: Raoul Gough <RaoulGough@yahoo.co.uk>
Date: Mon, 17 Nov 2003 19:27:13 +0000
Subject: [PATCH] Use BOOST_NESTED_TEMPLATE directly instead of creating own
 macro for MSVC6

[SVN r20833]
---
 .../suite/indexing/int_slice_helper.hpp       | 19 +++++++++----------
 .../python/suite/indexing/iterator_traits.hpp |  2 +-
 .../python/suite/indexing/workaround.hpp      |  6 ------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/include/boost/python/suite/indexing/int_slice_helper.hpp b/include/boost/python/suite/indexing/int_slice_helper.hpp
index 5eeafb59..45b86bbd 100755
--- a/include/boost/python/suite/indexing/int_slice_helper.hpp
+++ b/include/boost/python/suite/indexing/int_slice_helper.hpp
@@ -166,13 +166,12 @@ namespace boost { namespace python { namespace indexing {
 
     else
       {
-        detail::maybe_insert<container_traits::has_insert>
-          ::BOOST_PYTHON_INDEXING_NESTED_TEMPLATE apply
+        detail::maybe_insert<container_traits::has_insert>::
 # if defined (BOOST_NO_MEMBER_TEMPLATES) \
-        && defined (BOOST_MSVC6_MEMBER_TEMPLATES)
-          (static_cast<Algorithms *>(0),
+  && defined (BOOST_MSVC6_MEMBER_TEMPLATES)
+          apply (static_cast<Algorithms *>(0),
 # else
-          <Algorithms> (
+          BOOST_NESTED_TEMPLATE apply <Algorithms> (
 # endif
               *m_ptr, m_pos, val);
 
@@ -228,13 +227,13 @@ namespace boost { namespace python { namespace indexing {
 
     else
       {
-        detail::maybe_erase<container_traits::has_erase>
-          ::BOOST_PYTHON_INDEXING_NESTED_TEMPLATE apply
+        detail::maybe_erase<container_traits::has_erase>::
+
 # if defined (BOOST_NO_MEMBER_TEMPLATES) \
-        && defined (BOOST_MSVC6_MEMBER_TEMPLATES)
-          (static_cast<Algorithms *>(0),
+  && defined (BOOST_MSVC6_MEMBER_TEMPLATES)
+          apply (static_cast<Algorithms *>(0),
 # else
-          <Algorithms> (
+          BOOST_NESTED_TEMPLATE apply <Algorithms> (
 # endif
               *m_ptr, m_pos, m_slice.stop());
       }
diff --git a/include/boost/python/suite/indexing/iterator_traits.hpp b/include/boost/python/suite/indexing/iterator_traits.hpp
index 466d4deb..b3e5850b 100755
--- a/include/boost/python/suite/indexing/iterator_traits.hpp
+++ b/include/boost/python/suite/indexing/iterator_traits.hpp
@@ -129,7 +129,7 @@ namespace boost { namespace python { namespace indexing {
 
     public:
       typedef typename traits_by_category <max_category>
-        ::BOOST_PYTHON_INDEXING_NESTED_TEMPLATE traits<Iterator>::type type;
+        ::BOOST_NESTED_TEMPLATE traits<Iterator>::type type;
     };
   }
 
diff --git a/include/boost/python/suite/indexing/workaround.hpp b/include/boost/python/suite/indexing/workaround.hpp
index 045bc7a8..303a158c 100755
--- a/include/boost/python/suite/indexing/workaround.hpp
+++ b/include/boost/python/suite/indexing/workaround.hpp
@@ -30,11 +30,6 @@
 # endif
 
 # if BOOST_WORKAROUND (BOOST_MSVC, <= 1300)
-// visualc.hpp never seems to define BOOST_NO_MEMBER_TEMPLATE_KEYWORD
-// so BOOST_NESTED_TEMPLATE ends up expanding to "template" instead of
-// being empty. This causes some compile errors with MSVC[67]
-#   define BOOST_PYTHON_INDEXING_NESTED_TEMPLATE
-
 // Workaround the lack of a reset member function in std::auto_ptr
 namespace boost { namespace python { namespace indexing {
 template<typename T> void reset_auto_ptr (T &aptr, T::element_type *pptr) {
@@ -44,7 +39,6 @@ template<typename T> void reset_auto_ptr (T &aptr, T::element_type *pptr) {
 #   define BOOST_PYTHON_INDEXING_RESET_AUTO_PTR \
         ::boost::python::indexing::reset_auto_ptr
 # else
-#   define BOOST_PYTHON_INDEXING_NESTED_TEMPLATE BOOST_NESTED_TEMPLATE
 #   define BOOST_PYTHON_INDEXING_RESET_AUTO_PTR( aptr, pptr ) \
         (aptr).reset(pptr)
 # endif