From 0f66412487d4d4eaa7d5eed81a3376e804a6fa0a Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Fri, 11 Oct 2013 23:20:59 +0000
Subject: [PATCH] Simplify multi-component ifdefs containing
 BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION

[SVN r86248]
---
 include/boost/bind/bind.hpp    | 6 +++---
 include/boost/bind/storage.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/bind/bind.hpp b/include/boost/bind/bind.hpp
index 2b0a1fe..f1b94f5 100644
--- a/include/boost/bind/bind.hpp
+++ b/include/boost/bind/bind.hpp
@@ -60,7 +60,7 @@ template<class R, class F> struct result_traits
     typedef R type;
 };
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 
 struct unspecified {};
 
@@ -1432,7 +1432,7 @@ template<class R, class F, class A1, class A2, class A3, class A4, class A5, cla
     return _bi::bind_t<R, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
 }
 
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+#if !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 
 // adaptable function objects
 
@@ -1516,7 +1516,7 @@ template<class F, class A1, class A2, class A3, class A4, class A5, class A6, cl
     return _bi::bind_t<_bi::unspecified, F, list_type>(f, list_type(a1, a2, a3, a4, a5, a6, a7, a8, a9));
 }
 
-#endif // !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
+#endif // !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
 
 // function pointers
 
diff --git a/include/boost/bind/storage.hpp b/include/boost/bind/storage.hpp
index 9891c8c..6a5a402 100644
--- a/include/boost/bind/storage.hpp
+++ b/include/boost/bind/storage.hpp
@@ -49,7 +49,7 @@ template<class A1> struct storage1
     A1 a1_;
 };
 
-#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) && !defined( __BORLANDC__ )
+#if !defined( __BORLANDC__ )
 
 template<int I> struct storage1< boost::arg<I> >
 {