From 184a38fee123cdbee4848a517015762bfc1d0e87 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 20 Dec 2007 19:16:30 +0000 Subject: [PATCH] Use BOOST_DEDUCED_TYPENAME in unordered_set.hpp and unordered_map.hpp [SVN r42207] --- include/boost/unordered_map.hpp | 48 ++++++++++++++++----------------- include/boost/unordered_set.hpp | 48 ++++++++++++++++----------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/include/boost/unordered_map.hpp b/include/boost/unordered_map.hpp index 48609ce0..6fface3f 100644 --- a/include/boost/unordered_map.hpp +++ b/include/boost/unordered_map.hpp @@ -32,7 +32,7 @@ namespace boost std::pair, Key, Hash, Pred, Alloc > implementation; - typename implementation::hash_table base; + BOOST_DEDUCED_TYPENAME implementation::hash_table base; public: @@ -45,18 +45,18 @@ namespace boost typedef Pred key_equal; typedef Alloc allocator_type; - typedef typename allocator_type::pointer pointer; - typedef typename allocator_type::const_pointer const_pointer; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference; - typedef typename implementation::size_type size_type; - typedef typename implementation::difference_type difference_type; + typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type; + typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type; - typedef typename implementation::iterator iterator; - typedef typename implementation::const_iterator const_iterator; - typedef typename implementation::local_iterator local_iterator; - typedef typename implementation::const_local_iterator const_local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator; // construct/destroy/copy @@ -88,7 +88,7 @@ namespace boost private: - typename implementation::iterator_base const& + BOOST_DEDUCED_TYPENAME implementation::iterator_base const& get(const_iterator const& it) { return boost::unordered_detail::iterator_access::get(it); @@ -345,7 +345,7 @@ namespace boost std::pair, Key, Hash, Pred, Alloc > implementation; - typename implementation::hash_table base; + BOOST_DEDUCED_TYPENAME implementation::hash_table base; public: @@ -358,18 +358,18 @@ namespace boost typedef Pred key_equal; typedef Alloc allocator_type; - typedef typename allocator_type::pointer pointer; - typedef typename allocator_type::const_pointer const_pointer; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference; - typedef typename implementation::size_type size_type; - typedef typename implementation::difference_type difference_type; + typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type; + typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type; - typedef typename implementation::iterator iterator; - typedef typename implementation::const_iterator const_iterator; - typedef typename implementation::local_iterator local_iterator; - typedef typename implementation::const_local_iterator const_local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::iterator iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::local_iterator local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator; // construct/destroy/copy @@ -401,7 +401,7 @@ namespace boost private: - typename implementation::iterator_base const& + BOOST_DEDUCED_TYPENAME implementation::iterator_base const& get(const_iterator const& it) { return boost::unordered_detail::iterator_access::get(it); diff --git a/include/boost/unordered_set.hpp b/include/boost/unordered_set.hpp index 011440a4..056a9e22 100644 --- a/include/boost/unordered_set.hpp +++ b/include/boost/unordered_set.hpp @@ -31,7 +31,7 @@ namespace boost Value, Value, Hash, Pred, Alloc > implementation; - typename implementation::hash_table base; + BOOST_DEDUCED_TYPENAME implementation::hash_table base; public: @@ -43,18 +43,18 @@ namespace boost typedef Pred key_equal; typedef Alloc allocator_type; - typedef typename allocator_type::pointer pointer; - typedef typename allocator_type::const_pointer const_pointer; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference; - typedef typename implementation::size_type size_type; - typedef typename implementation::difference_type difference_type; + typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type; + typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type; - typedef typename implementation::const_iterator iterator; - typedef typename implementation::const_iterator const_iterator; - typedef typename implementation::const_local_iterator local_iterator; - typedef typename implementation::const_local_iterator const_local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator; // construct/destroy/copy @@ -85,7 +85,7 @@ namespace boost private: - typename implementation::iterator_base const& + BOOST_DEDUCED_TYPENAME implementation::iterator_base const& get(const_iterator const& it) { return boost::unordered_detail::iterator_access::get(it); @@ -314,7 +314,7 @@ namespace boost Value, Value, Hash, Pred, Alloc > implementation; - typename implementation::hash_table base; + BOOST_DEDUCED_TYPENAME implementation::hash_table base; public: @@ -326,18 +326,18 @@ namespace boost typedef Pred key_equal; typedef Alloc allocator_type; - typedef typename allocator_type::pointer pointer; - typedef typename allocator_type::const_pointer const_pointer; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::pointer pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_pointer const_pointer; + typedef BOOST_DEDUCED_TYPENAME allocator_type::reference reference; + typedef BOOST_DEDUCED_TYPENAME allocator_type::const_reference const_reference; - typedef typename implementation::size_type size_type; - typedef typename implementation::difference_type difference_type; + typedef BOOST_DEDUCED_TYPENAME implementation::size_type size_type; + typedef BOOST_DEDUCED_TYPENAME implementation::difference_type difference_type; - typedef typename implementation::const_iterator iterator; - typedef typename implementation::const_iterator const_iterator; - typedef typename implementation::const_local_iterator local_iterator; - typedef typename implementation::const_local_iterator const_local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_iterator const_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator local_iterator; + typedef BOOST_DEDUCED_TYPENAME implementation::const_local_iterator const_local_iterator; // construct/destroy/copy @@ -368,7 +368,7 @@ namespace boost private: - typename implementation::iterator_base const& + BOOST_DEDUCED_TYPENAME implementation::iterator_base const& get(const_iterator const& it) { return boost::unordered_detail::iterator_access::get(it);