Trim trailing spaces.

Merge pull request #15 from DanielaE/fix/replace-deprecated-allocator-members
Most members of std::allocate are deprecated in C++17
2025-07-29 20:07:15 +02:00 · 2018-01-01 15:52:37 +03:00 · 2017-12-30 22:12:21 +03:00 · 2017-12-30 18:15:56 +01:00
1 changed files with 7 additions and 2 deletions
--- a/include/boost/detail/allocator_utilities.hpp
+++ b/include/boost/detail/allocator_utilities.hpp
@ -121,8 +121,13 @@ struct rebinder
  template<typename Type>
  struct result
  {
-      typedef typename Allocator::BOOST_NESTED_TEMPLATE 
+#ifdef BOOST_NO_CXX11_ALLOCATOR
+      typedef typename Allocator::BOOST_NESTED_TEMPLATE
          rebind<Type>::other other;
+#else
+      typedef typename std::allocator_traits<Allocator>::BOOST_NESTED_TEMPLATE
+          rebind_alloc<Type> other;
+#endif
  };
 };

@ -159,7 +164,7 @@ void construct(void* p,const Type& t)
 */

 #pragma warning(push)
-#pragma warning(disable:4100)  
+#pragma warning(disable:4100)
 #endif

 template<typename Type>
Author	SHA1	Message	Date
Andrey Semashev	824721a753	Trim trailing spaces.	2018-01-01 15:52:37 +03:00
Andrey Semashev	bb0840b9c8	Merge pull request #15 from DanielaE/fix/replace-deprecated-allocator-members Most members of std::allocate are deprecated in C++17	2017-12-30 22:12:21 +03:00
Daniela Engert	1631ba8134	Most members of std::allocate are deprecated in C++17 Replace them by their cousins from std::allocator_traits. Signed-off-by: Daniela Engert <dani@ngrt.de>	2017-12-30 18:15:56 +01:00