Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85896 - in trunk/boost: . bimap multi_index/detail python regex/v4 utility variant variant/detail
From: steveire_at_[hidden]
Date: 2013-09-25 06:29:44


Author: skelly
Date: 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013)
New Revision: 85896
URL: http://svn.boost.org/trac/boost/changeset/85896

Log:
Remove use of obsolete BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE{,_SPEC} macro.

Text files modified:
   trunk/boost/bimap/bimap.hpp | 6 ++----
   trunk/boost/multi_index/detail/index_node_base.hpp | 4 +---
   trunk/boost/multi_index/detail/rnd_index_ops.hpp | 12 ++++--------
   trunk/boost/multi_index/detail/seq_index_ops.hpp | 3 +--
   trunk/boost/multi_index_container.hpp | 22 ++++++----------------
   trunk/boost/python/pure_virtual.hpp | 2 +-
   trunk/boost/rational.hpp | 3 +--
   trunk/boost/regex/v4/cpp_regex_traits.hpp | 2 +-
   trunk/boost/regex/v4/w32_regex_traits.hpp | 2 +-
   trunk/boost/utility/in_place_factory.hpp | 6 ++----
   trunk/boost/variant/detail/cast_storage.hpp | 10 ++--------
   trunk/boost/variant/get.hpp | 3 +--
   12 files changed, 23 insertions(+), 52 deletions(-)

Modified: trunk/boost/bimap/bimap.hpp
==============================================================================
--- trunk/boost/bimap/bimap.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/bimap/bimap.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -342,8 +342,7 @@
     template< class Tag, class IteratorType >
     BOOST_DEDUCED_TYPENAME ::boost::bimaps::support::
     iterator_type_by<Tag,bimap>::type
- project(IteratorType iter
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+ project(IteratorType iter)
     {
         return core.template project<Tag>(iter.base());
     }
@@ -351,8 +350,7 @@
     template< class Tag, class IteratorType >
     BOOST_DEDUCED_TYPENAME ::boost::bimaps::support::
     const_iterator_type_by<Tag,bimap>::type
- project(IteratorType iter
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag)) const
+ project(IteratorType iter) const
     {
         return core.template project<Tag>(iter.base());
     }

Modified: trunk/boost/multi_index/detail/index_node_base.hpp
==============================================================================
--- trunk/boost/multi_index/detail/index_node_base.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/multi_index/detail/index_node_base.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -85,9 +85,7 @@
 };
 
 template<typename Node,typename Value>
-Node* node_from_value(
- const Value* p
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node))
+Node* node_from_value(const Value* p)
 {
   typedef typename Node::allocator_type allocator_type;
   return static_cast<Node*>(

Modified: trunk/boost/multi_index/detail/rnd_index_ops.hpp
==============================================================================
--- trunk/boost/multi_index/detail/rnd_index_ops.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/multi_index/detail/rnd_index_ops.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -30,8 +30,7 @@
 
 template<typename Node,typename Allocator,typename Predicate>
 Node* random_access_index_remove(
- random_access_index_ptr_array<Allocator>& ptrs,Predicate pred
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node))
+ random_access_index_ptr_array<Allocator>& ptrs,Predicate pred)
 {
   typedef typename Node::value_type value_type;
   typedef typename Node::impl_ptr_pointer impl_ptr_pointer;
@@ -55,8 +54,7 @@
 
 template<typename Node,typename Allocator,class BinaryPredicate>
 Node* random_access_index_unique(
- random_access_index_ptr_array<Allocator>& ptrs,BinaryPredicate binary_pred
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node))
+ random_access_index_ptr_array<Allocator>& ptrs,BinaryPredicate binary_pred)
 {
   typedef typename Node::value_type value_type;
   typedef typename Node::impl_ptr_pointer impl_ptr_pointer;
@@ -86,8 +84,7 @@
 void random_access_index_inplace_merge(
   const Allocator& al,
   random_access_index_ptr_array<Allocator>& ptrs,
- BOOST_DEDUCED_TYPENAME Node::impl_ptr_pointer first1,Compare comp
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node))
+ BOOST_DEDUCED_TYPENAME Node::impl_ptr_pointer first1,Compare comp)
 {
   typedef typename Node::value_type value_type;
   typedef typename Node::impl_pointer impl_pointer;
@@ -151,8 +148,7 @@
 void random_access_index_sort(
   const Allocator& al,
   random_access_index_ptr_array<Allocator>& ptrs,
- Compare comp
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node))
+ Compare comp)
 {
   /* The implementation is extremely simple: an auxiliary
    * array of pointers is sorted using stdlib facilities and

Modified: trunk/boost/multi_index/detail/seq_index_ops.hpp
==============================================================================
--- trunk/boost/multi_index/detail/seq_index_ops.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/multi_index/detail/seq_index_ops.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -79,8 +79,7 @@
 void sequenced_index_collate(
   BOOST_DEDUCED_TYPENAME Node::impl_type* x,
   BOOST_DEDUCED_TYPENAME Node::impl_type* y,
- Compare comp
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Node))
+ Compare comp)
 {
   typedef typename Node::impl_type impl_type;
   typedef typename Node::impl_pointer impl_pointer;

Modified: trunk/boost/multi_index_container.hpp
==============================================================================
--- trunk/boost/multi_index_container.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/multi_index_container.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -506,9 +506,7 @@
   };
 
   template<typename Tag,typename IteratorType>
- typename index_iterator<Tag>::type project(
- IteratorType it
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+ typename index_iterator<Tag>::type project(IteratorType it)
   {
     typedef typename index<Tag>::type index;
 
@@ -524,9 +522,7 @@
   }
 
   template<typename Tag,typename IteratorType>
- typename index_const_iterator<Tag>::type project(
- IteratorType it
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))const
+ typename index_const_iterator<Tag>::type project(IteratorType it)const
   {
     typedef typename index<Tag>::type index;
 
@@ -1116,9 +1112,7 @@
>
 typename ::boost::multi_index::index<
   multi_index_container<Value,IndexSpecifierList,Allocator>,Tag>::type&
-get(
- multi_index_container<Value,IndexSpecifierList,Allocator>& m
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+get(multi_index_container<Value,IndexSpecifierList,Allocator>& m)
 {
   typedef multi_index_container<
     Value,IndexSpecifierList,Allocator> multi_index_type;
@@ -1136,9 +1130,7 @@
>
 const typename ::boost::multi_index::index<
   multi_index_container<Value,IndexSpecifierList,Allocator>,Tag>::type&
-get(
- const multi_index_container<Value,IndexSpecifierList,Allocator>& m
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+get(const multi_index_container<Value,IndexSpecifierList,Allocator>& m)
 {
   typedef multi_index_container<
     Value,IndexSpecifierList,Allocator> multi_index_type;
@@ -1266,8 +1258,7 @@
   multi_index_container<Value,IndexSpecifierList,Allocator>,Tag>::type
 project(
   multi_index_container<Value,IndexSpecifierList,Allocator>& m,
- IteratorType it
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+ IteratorType it)
 {
   typedef multi_index_container<
     Value,IndexSpecifierList,Allocator> multi_index_type;
@@ -1302,8 +1293,7 @@
   multi_index_container<Value,IndexSpecifierList,Allocator>,Tag>::type
 project(
   const multi_index_container<Value,IndexSpecifierList,Allocator>& m,
- IteratorType it
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(Tag))
+ IteratorType it)
 {
   typedef multi_index_container<
     Value,IndexSpecifierList,Allocator> multi_index_type;

Modified: trunk/boost/python/pure_virtual.hpp
==============================================================================
--- trunk/boost/python/pure_virtual.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/python/pure_virtual.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -47,7 +47,7 @@
   // replaced by void, and whose first argument is replaced by C&.
   template <class C, class S>
   typename replace_front2<S,void,C&>::type
- error_signature(S BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(C))
+ error_signature(S)
   {
       typedef typename replace_front2<S,void,C&>::type r;
       return r();

Modified: trunk/boost/rational.hpp
==============================================================================
--- trunk/boost/rational.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/rational.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -657,8 +657,7 @@
 // Type conversion
 template <typename T, typename IntType>
 BOOST_CONSTEXPR
-inline T rational_cast(
- const rational<IntType>& src BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T))
+inline T rational_cast(const rational<IntType>& src)
 {
     return static_cast<T>(src.numerator())/static_cast<T>(src.denominator());
 }

Modified: trunk/boost/regex/v4/cpp_regex_traits.hpp
==============================================================================
--- trunk/boost/regex/v4/cpp_regex_traits.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/regex/v4/cpp_regex_traits.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -857,7 +857,7 @@
 
 
 template <class charT>
-inline boost::shared_ptr<const cpp_regex_traits_implementation<charT> > create_cpp_regex_traits(const std::locale& l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT))
+inline boost::shared_ptr<const cpp_regex_traits_implementation<charT> > create_cpp_regex_traits(const std::locale& l)
 {
    cpp_regex_traits_base<charT> key(l);
    return ::boost::object_cache<cpp_regex_traits_base<charT>, cpp_regex_traits_implementation<charT> >::get(key, 5);

Modified: trunk/boost/regex/v4/w32_regex_traits.hpp
==============================================================================
--- trunk/boost/regex/v4/w32_regex_traits.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/regex/v4/w32_regex_traits.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -552,7 +552,7 @@
 
 
 template <class charT>
-boost::shared_ptr<const w32_regex_traits_implementation<charT> > create_w32_regex_traits(::boost::re_detail::lcid_type l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT))
+boost::shared_ptr<const w32_regex_traits_implementation<charT> > create_w32_regex_traits(::boost::re_detail::lcid_type l)
 {
    // TODO: create a cache for previously constructed objects.
    return boost::object_cache< ::boost::re_detail::lcid_type, w32_regex_traits_implementation<charT> >::get(l, 5);

Modified: trunk/boost/utility/in_place_factory.hpp
==============================================================================
--- trunk/boost/utility/in_place_factory.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/utility/in_place_factory.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -48,15 +48,13 @@
   {}
 
   template<class T>
- void* apply(void* address
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
+ void* apply(void* address) const
   {
     return new(address) T( BOOST_PP_ENUM_PARAMS(N, m_a) );
   }
 
   template<class T>
- void* apply(void* address, std::size_t n
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)) const
+ void* apply(void* address, std::size_t n) const
   {
     for(char* next = address = this->BOOST_NESTED_TEMPLATE apply<T>(address);
         !! --n;)

Modified: trunk/boost/variant/detail/cast_storage.hpp
==============================================================================
--- trunk/boost/variant/detail/cast_storage.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/variant/detail/cast_storage.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -25,19 +25,13 @@
 //
 
 template <typename T>
-inline T& cast_storage(
- void* storage
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)
- )
+inline T& cast_storage(void* storage)
 {
     return *static_cast<T*>(storage);
 }
 
 template <typename T>
-inline const T& cast_storage(
- const void* storage
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(T)
- )
+inline const T& cast_storage(const void* storage)
 {
     return *static_cast<const T*>(storage);
 }

Modified: trunk/boost/variant/get.hpp
==============================================================================
--- trunk/boost/variant/get.hpp Wed Sep 25 06:29:10 2013 (r85895)
+++ trunk/boost/variant/get.hpp 2013-09-25 06:29:44 EDT (Wed, 25 Sep 2013) (r85896)
@@ -129,8 +129,7 @@
 }} // namespace detail::variant
 
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x0551))
-# define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t) \
- BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(t)
+# define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t)
 #else
 # define BOOST_VARIANT_AUX_GET_EXPLICIT_TEMPLATE_TYPE(t) \
     , t* = 0


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk