From af136e483d1290339045138421811f16d7e9d931 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Fri, 11 Oct 2013 23:15:00 +0000 Subject: [PATCH] Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION Process #ifndef...#endif conditions. [SVN r86244] --- include/boost/bind/arg.hpp | 2 -- include/boost/bind/bind.hpp | 2 -- include/boost/bind/storage.hpp | 16 ---------------- 3 files changed, 20 deletions(-) diff --git a/include/boost/bind/arg.hpp b/include/boost/bind/arg.hpp index c1da4d0..797e2b7 100644 --- a/include/boost/bind/arg.hpp +++ b/include/boost/bind/arg.hpp @@ -43,7 +43,6 @@ template< int I > bool operator==( arg const &, arg const & ) return true; } -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template< int I > struct is_placeholder< arg > { @@ -55,7 +54,6 @@ template< int I > struct is_placeholder< arg (*) () > enum _vt { value = I }; }; -#endif } // namespace boost diff --git a/include/boost/bind/bind.hpp b/include/boost/bind/bind.hpp index 7f45242..2b0a1fe 100644 --- a/include/boost/bind/bind.hpp +++ b/include/boost/bind/bind.hpp @@ -1255,14 +1255,12 @@ template< class T > struct is_bind_expression enum _vt { value = 0 }; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template< class R, class F, class L > struct is_bind_expression< _bi::bind_t< R, F, L > > { enum _vt { value = 1 }; }; -#endif // bind diff --git a/include/boost/bind/storage.hpp b/include/boost/bind/storage.hpp index 556f707..9891c8c 100644 --- a/include/boost/bind/storage.hpp +++ b/include/boost/bind/storage.hpp @@ -88,7 +88,6 @@ template struct storage2: public storage1 A2 a2_; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template struct storage2< A1, boost::arg >: public storage1 { @@ -118,7 +117,6 @@ template struct storage2< A1, boost::arg (*) () >: public st static boost::arg a2_() { return boost::arg(); } }; -#endif // 3 @@ -137,7 +135,6 @@ template struct storage3: public storage2< A1, A2 A3 a3_; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template struct storage3< A1, A2, boost::arg >: public storage2< A1, A2 > { @@ -167,7 +164,6 @@ template struct storage3< A1, A2, boost::arg (*) ( static boost::arg a3_() { return boost::arg(); } }; -#endif // 4 @@ -186,7 +182,6 @@ template struct storage4: public storage A4 a4_; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template struct storage4< A1, A2, A3, boost::arg >: public storage3< A1, A2, A3 > { @@ -216,7 +211,6 @@ template struct storage4< A1, A2, A3, boost static boost::arg a4_() { return boost::arg(); } }; -#endif // 5 @@ -235,7 +229,6 @@ template struct storage5: publ A5 a5_; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template struct storage5< A1, A2, A3, A4, boost::arg >: public storage4< A1, A2, A3, A4 > { @@ -265,7 +258,6 @@ template struct storage5< A1, A2, static boost::arg a5_() { return boost::arg(); } }; -#endif // 6 @@ -284,7 +276,6 @@ template struct stor A6 a6_; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template struct storage6< A1, A2, A3, A4, A5, boost::arg >: public storage5< A1, A2, A3, A4, A5 > { @@ -314,7 +305,6 @@ template struct storage static boost::arg a6_() { return boost::arg(); } }; -#endif // 7 @@ -333,7 +323,6 @@ template s A7 a7_; }; -#if !defined( BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) template struct storage7< A1, A2, A3, A4, A5, A6, boost::arg >: public storage6< A1, A2, A3, A4, A5, A6 > { @@ -363,7 +352,6 @@ template stru static boost::arg a7_() { return boost::arg(); } }; -#endif // 8 @@ -382,7 +370,6 @@ template struct storage8< A1, A2, A3, A4, A5, A6, A7, boost::arg >: public storage7< A1, A2, A3, A4, A5, A6, A7 > { @@ -412,7 +399,6 @@ template a8_() { return boost::arg(); } }; -#endif // 9 @@ -431,7 +417,6 @@ template struct storage9< A1, A2, A3, A4, A5, A6, A7, A8, boost::arg >: public storage8< A1, A2, A3, A4, A5, A6, A7, A8 > { @@ -461,7 +446,6 @@ template a9_() { return boost::arg(); } }; -#endif } // namespace _bi