From e8595a05af337caea445be872f041c731bf2592e Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glenfe@live.com>
Date: Tue, 4 Feb 2014 08:43:36 -0800
Subject: [PATCH] Fix use of rebind_traits and rebind_alloc

---
 include/boost/smart_ptr/detail/array_allocator.hpp | 11 ++++-------
 include/boost/smart_ptr/detail/array_deleter.hpp   |  5 ++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/include/boost/smart_ptr/detail/array_allocator.hpp b/include/boost/smart_ptr/detail/array_allocator.hpp
index 3371545..8b682eb 100644
--- a/include/boost/smart_ptr/detail/array_allocator.hpp
+++ b/include/boost/smart_ptr/detail/array_allocator.hpp
@@ -46,16 +46,13 @@ namespace boost {
 
 #if !defined(BOOST_NO_CXX11_ALLOCATOR)
             typedef typename std::allocator_traits<A>::
-                template rebind_alloc<Y>::other YA;
-
+                template rebind_alloc<Y> YA;
             typedef typename std::allocator_traits<A>::
-                template rebind_alloc<char>::other CA;
-
+                template rebind_alloc<char> CA;
             typedef typename std::allocator_traits<A>::
-                template rebind_traits<Y>::other YT;
-
+                template rebind_traits<Y> YT;
             typedef typename std::allocator_traits<A>::
-                template rebind_traits<char>::other CT;
+                template rebind_traits<char> CT;
 #else
             typedef typename A::template rebind<Y>::other YA;
             typedef typename A::template rebind<char>::other CA;
diff --git a/include/boost/smart_ptr/detail/array_deleter.hpp b/include/boost/smart_ptr/detail/array_deleter.hpp
index 7d99795..529c112 100644
--- a/include/boost/smart_ptr/detail/array_deleter.hpp
+++ b/include/boost/smart_ptr/detail/array_deleter.hpp
@@ -90,10 +90,9 @@ namespace boost {
         private:
 #if !defined(BOOST_NO_CXX11_ALLOCATOR)
             typedef typename std::allocator_traits<A>::
-                template rebind_alloc<type>::other TA;
-
+                template rebind_alloc<type> TA;
             typedef typename std::allocator_traits<A>::
-                template rebind_traits<type>::other TT;
+                template rebind_traits<type> TT;
 #endif
 
             void destroy(type*, std::size_t, boost::true_type) {