From bc5c28bd3cd1390b1b38bfc9d3854643f42f28cc Mon Sep 17 00:00:00 2001
From: Darin Adler <darin@bentspoon.com>
Date: Sat, 2 Feb 2002 18:36:12 +0000
Subject: [PATCH] New smart pointer documentation. Related clean-up of the
 smart pointer library. Changing includes to include the new individual smart
 pointer headers. Replacing old smart pointer library with an include of the
 new smart pointer headers. Simplify ifdefs that involve the member templates
 macros now that BOOST_MSVC6_MEMBER_TEMPLATES is also guaranteed to bet set
 for platforms that have full member templates.

[SVN r12647]
---
 include/boost/type_traits/object_traits.hpp    | 4 ++--
 include/boost/type_traits/transform_traits.hpp | 2 +-
 tests/is_convertible_test.cpp                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/type_traits/object_traits.hpp b/include/boost/type_traits/object_traits.hpp
index 17290f6..50cc36f 100644
--- a/include/boost/type_traits/object_traits.hpp
+++ b/include/boost/type_traits/object_traits.hpp
@@ -300,7 +300,7 @@ public:
 };
 
 #else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
-#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#ifdef BOOST_MSVC6_MEMBER_TEMPLATES
 
 namespace detail{
 
@@ -377,7 +377,7 @@ public:
 #else
 template <typename T> struct is_empty
 { enum{ value = BOOST_IS_EMPTY(T) }; };
-#endif  // defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#endif  // BOOST_MSVC6_MEMBER_TEMPLATES
 
 #endif  // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 
diff --git a/include/boost/type_traits/transform_traits.hpp b/include/boost/type_traits/transform_traits.hpp
index 06171d8..2d2f8f2 100644
--- a/include/boost/type_traits/transform_traits.hpp
+++ b/include/boost/type_traits/transform_traits.hpp
@@ -69,7 +69,7 @@ struct add_reference
 template <typename T>
 struct add_reference<T&>
 { typedef T& type; };
-#elif defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_MEMBER_TEMPLATES)
+#elif defined(BOOST_MSVC6_MEMBER_TEMPLATES)
 namespace detail{
 
 template <bool x>
diff --git a/tests/is_convertible_test.cpp b/tests/is_convertible_test.cpp
index fe0f9d5..b62288d 100644
--- a/tests/is_convertible_test.cpp
+++ b/tests/is_convertible_test.cpp
@@ -44,7 +44,7 @@ int cpp_main(int argc, char* argv[])
    value_test(true, (boost::is_convertible<float const&,convertible_from<float const&> >::value));
    value_test(true, (boost::is_convertible<float&,convertible_from<float const&> >::value));
 
-#if defined(BOOST_MSVC6_MEMBER_TEMPLATES) || !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+#ifdef BOOST_MSVC6_MEMBER_TEMPLATES
    value_test(false, (boost::is_convertible<float,void>::value));
    value_test(false, (boost::is_convertible<void,float>::value));
    value_test(true, (boost::is_convertible<void,void>::value));