Skip to content

Commit ef78dde

Browse files
steveiresteveire
committed
Remove BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
Process #ifdef...#else...#endif blocks. [SVN r86246]
1 parent 432b3a3 commit ef78dde

5 files changed

Lines changed: 0 additions & 93 deletions

File tree

‎include/boost/algorithm/string/sequence_traits.hpp‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,12 @@ namespace boost {
4545
class has_native_replace
4646
{
4747

48-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
49-
private:
50-
static T* t;
51-
public:
52-
BOOST_STATIC_CONSTANT(bool, value=(
53-
sizeof(has_native_replace_tester(t))==sizeof(yes_type) ) );
54-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
5548
public:
5649
# if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
5750
enum { value = false };
5851
# else
5952
BOOST_STATIC_CONSTANT(bool, value=false);
6053
# endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
61-
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
6254

6355

6456
typedef mpl::bool_<has_native_replace<T>::value> type;
@@ -73,20 +65,12 @@ namespace boost {
7365
template< typename T >
7466
class has_stable_iterators
7567
{
76-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
77-
private:
78-
static T* t;
79-
public:
80-
BOOST_STATIC_CONSTANT(bool, value=(
81-
sizeof(has_stable_iterators_tester(t))==sizeof(yes_type) ) );
82-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
8368
public:
8469
# if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
8570
enum { value = false };
8671
# else
8772
BOOST_STATIC_CONSTANT(bool, value=false);
8873
# endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
89-
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
9074

9175
typedef mpl::bool_<has_stable_iterators<T>::value> type;
9276
};
@@ -100,20 +84,12 @@ namespace boost {
10084
template< typename T >
10185
class has_const_time_insert
10286
{
103-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
104-
private:
105-
static T* t;
106-
public:
107-
BOOST_STATIC_CONSTANT(bool, value=(
108-
sizeof(has_const_time_insert_tester(t))==sizeof(yes_type) ) );
109-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
11087
public:
11188
# if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
11289
enum { value = false };
11390
# else
11491
BOOST_STATIC_CONSTANT(bool, value=false);
11592
# endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
116-
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
11793

11894
typedef mpl::bool_<has_const_time_insert<T>::value> type;
11995
};
@@ -127,20 +103,12 @@ namespace boost {
127103
template< typename T >
128104
class has_const_time_erase
129105
{
130-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
131-
private:
132-
static T* t;
133-
public:
134-
BOOST_STATIC_CONSTANT(bool, value=(
135-
sizeof(has_const_time_erase_tester(t))==sizeof(yes_type) ) );
136-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
137106
public:
138107
# if BOOST_WORKAROUND( __IBMCPP__, <= 600 )
139108
enum { value = false };
140109
# else
141110
BOOST_STATIC_CONSTANT(bool, value=false);
142111
# endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
143-
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
144112

145113
typedef mpl::bool_<has_const_time_erase<T>::value> type;
146114
};

‎include/boost/algorithm/string/std/list_traits.hpp‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,6 @@ namespace boost {
2020

2121
// std::list<> traits -----------------------------------------------//
2222

23-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
24-
25-
// stable iterators tester
26-
template<typename T, typename AllocT>
27-
yes_type has_stable_iterators_tester( const ::std::list<T,AllocT>* );
28-
29-
// const time insert tester
30-
template<typename T, typename AllocT>
31-
yes_type has_const_time_insert_tester( const ::std::list<T,AllocT>* );
32-
33-
// const time erase tester
34-
template<typename T, typename AllocT>
35-
yes_type has_const_time_erase_tester( const ::std::list<T,AllocT>* );
36-
37-
38-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
3923

4024
// stable iterators trait
4125
template<typename T, typename AllocT>
@@ -75,7 +59,6 @@ namespace boost {
7559
#endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
7660
typedef mpl::bool_<has_const_time_erase<T>::value> type;
7761
};
78-
#endif
7962

8063

8164
} // namespace algorithm

‎include/boost/algorithm/string/std/rope_traits.hpp‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,6 @@ namespace boost {
2020

2121
// SGI's std::rope<> traits -----------------------------------------------//
2222

23-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
24-
25-
// native replace tester
26-
template<typename T, typename TraitsT, typename AllocT>
27-
yes_type has_native_replace_tester( const std::rope<T, TraitsT, AllocT>* );
28-
29-
// stable iterators tester
30-
template<typename T, typename TraitsT, typename AllocT>
31-
yes_type has_stable_iterators_tester( const std::rope<T, TraitsT, AllocT>* );
32-
33-
// const time insert tester
34-
template<typename T, typename TraitsT, typename AllocT>
35-
yes_type has_const_time_insert_tester( const std::rope<T, TraitsT, AllocT>* );
36-
37-
// const time erase tester
38-
template<typename T, typename TraitsT, typename AllocT>
39-
yes_type has_const_time_erase_tester( const std::rope<T, TraitsT, AllocT>* );
40-
41-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
4223

4324
// native replace trait
4425
template<typename T, typename TraitsT, typename AllocT>
@@ -91,7 +72,6 @@ namespace boost {
9172
#endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
9273
typedef mpl::bool_<value> type;
9374
};
94-
#endif
9575

9676

9777
} // namespace algorithm

‎include/boost/algorithm/string/std/slist_traits.hpp‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,6 @@ namespace boost {
2121

2222
// SGI's std::slist<> traits -----------------------------------------------//
2323

24-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
25-
26-
// stable iterators tester
27-
template<typename T, typename AllocT>
28-
yes_type has_stable_iterators_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
29-
30-
// const time insert tester
31-
template<typename T, typename AllocT>
32-
yes_type has_const_time_insert_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
33-
34-
// const time erase tester
35-
template<typename T, typename AllocT>
36-
yes_type has_const_time_erase_tester( const BOOST_STD_EXTENSION_NAMESPACE::slist<T,AllocT>* );
37-
38-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
3924

4025
// stable iterators trait
4126
template<typename T, typename AllocT>
@@ -75,7 +60,6 @@ namespace boost {
7560
#endif // BOOST_WORKAROUND( __IBMCPP__, <= 600 )
7661
typedef mpl::bool_<has_const_time_erase<T>::value> type;
7762
};
78-
#endif
7963

8064

8165
} // namespace algorithm

‎include/boost/algorithm/string/std/string_traits.hpp‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ namespace boost {
2020

2121
// std::basic_string<> traits -----------------------------------------------//
2222

23-
#ifdef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
24-
25-
// native replace tester
26-
template<typename T, typename TraitsT, typename AllocT>
27-
yes_type has_native_replace_tester( const std::basic_string<T, TraitsT, AllocT>* );
28-
29-
#else // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
3023

3124
// native replace trait
3225
template<typename T, typename TraitsT, typename AllocT>
@@ -43,7 +36,6 @@ namespace boost {
4336
};
4437

4538

46-
#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
4739

4840
} // namespace algorithm
4941
} // namespace boost

0 commit comments

Comments
 (0)