Imported from /home/lorry/working-area/delta_boost-tarball/boost_1_58_0.tar.bz2.HEADboost_1_58_0master

5 files changed, 2 insertions, 14 deletions

diff --git a/boost/function_types/components.hpp b/boost/function_types/components.hpp
index 53d81b60d..d348682b8 100644
--- a/boost/function_types/components.hpp
+++ b/boost/function_types/components.hpp
@@ -47,7 +47,6 @@
 
 #include <boost/function_types/config/config.hpp>
 
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 #   if   BOOST_FT_MAX_ARITY < 10
 #     include <boost/mpl/vector/vector10.hpp>
 #   elif BOOST_FT_MAX_ARITY < 20
@@ -59,9 +58,6 @@
 #   elif BOOST_FT_MAX_ARITY < 50
 #     include <boost/mpl/vector/vector50.hpp>
 #   endif
-#else
-#   include <boost/function_types/detail/classifier.hpp>
-#endif
 
 #include <boost/function_types/detail/class_transform.hpp>
 #include <boost/function_types/property_tags.hpp>
diff --git a/boost/function_types/detail/class_transform.hpp b/boost/function_types/detail/class_transform.hpp
index ef9a2253b..27b97b3ff 100644
--- a/boost/function_types/detail/class_transform.hpp
+++ b/boost/function_types/detail/class_transform.hpp
@@ -28,7 +28,6 @@ struct class_transform
 { typedef typename mpl::apply1<L,T>::type type; };
 
 
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // We can short-circuit the mechanism implemented in the primary template for 
 // the most common lambda expression and save both the "un-lambdaing" and the
 // type traits invocation (we know that T can only be a class type).
@@ -53,7 +52,6 @@ template<typename T> struct class_transform< T, add_pointer< remove_cv<_> > >
 
 template<typename T, typename U> struct class_transform< T, mpl::always<U> >
 { typedef U type; };
-#endif
 
 
 } } } // namespace ::boost::function_types::detail
diff --git a/boost/function_types/detail/cv_traits.hpp b/boost/function_types/detail/cv_traits.hpp
index 242f45b3b..4e15fa480 100644
--- a/boost/function_types/detail/cv_traits.hpp
+++ b/boost/function_types/detail/cv_traits.hpp
@@ -12,8 +12,7 @@
 #include <cstddef>
 #include <boost/detail/workaround.hpp>
 
-#if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
+#if BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
 #   include <boost/type_traits/remove_cv.hpp>
 #   include <boost/type_traits/remove_pointer.hpp>
 #   include <boost/type_traits/remove_reference.hpp>
@@ -23,8 +22,7 @@
 
 namespace boost { namespace function_types { namespace detail {
 
-#if ! (defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) \
-    || BOOST_WORKAROUND(__BORLANDC__, <= 0x582))
+#if !BOOST_WORKAROUND(__BORLANDC__, <= 0x582)
 
 template<typename T> struct cv_traits 
 { typedef non_cv tag; typedef T type; };
diff --git a/boost/function_types/detail/to_sequence.hpp b/boost/function_types/detail/to_sequence.hpp
index 828acd9af..54854dbfa 100644
--- a/boost/function_types/detail/to_sequence.hpp
+++ b/boost/function_types/detail/to_sequence.hpp
@@ -32,14 +32,12 @@ struct to_sequence
   type;
 };
 
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 // reduce template instantiations, if possible
 template<typename T, typename U>
 struct to_sequence< components<T,U> > 
 {
   typedef typename components<T,U>::types type;
 };
-#endif
 
 } } } // namespace ::boost::function_types::detail
 
diff --git a/boost/function_types/property_tags.hpp b/boost/function_types/property_tags.hpp
index bbc64d53a..c2158d352 100644
--- a/boost/function_types/property_tags.hpp
+++ b/boost/function_types/property_tags.hpp
@@ -102,7 +102,6 @@ struct tag
         detail::compound_tag<Tag3,Tag4> >
 { };
 
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
 template<class Tag1, class Tag2, class Tag3> struct tag<Tag1,Tag2,Tag3,null_tag>
   : detail::compound_tag<detail::compound_tag<Tag1,Tag2>,Tag3>
 { };
@@ -112,7 +111,6 @@ template<class Tag1, class Tag2> struct tag<Tag1,Tag2,null_tag,null_tag>
 template<class Tag1> struct tag<Tag1,null_tag,null_tag,null_tag>
   : Tag1
 { };
-#endif
 
 
 template<class Tag, class QueryTag> struct represents