Patchwork [v3] Add allocator_arg_t, uses_allocator...

login
register
mail settings
Submitter Paolo Carlini
Date Sept. 27, 2010, 5:29 p.m.
Message ID <4CA0D48E.7060401@oracle.com>
Download mbox | patch
Permalink /patch/65887/
State New
Headers show

Comments

Paolo Carlini - Sept. 27, 2010, 5:29 p.m.
Hi,

tested x86_64-linux, committed to mainline.

Thanks,
Paolo.

PS: Jon, is there code in <future> and elsewhere which we could enable
rather easily?!?
2010-09-27  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/allocator.h (allocator_arg_t, allocator_arg,
	uses_allocator): Add.
	* testsuite/20_util/uses_allocator/value.cc: New.
	* testsuite/20_util/uses_allocator/requirements/typedefs.cc: Likewise.
	* testsuite/20_util/uses_allocator/requirements/
	explicit_instantiation.cc: Likewise.
	* include/bits/stl_queue.h (uses_allocator<queue>,
	uses_allocator<priority_queue>): Add.
	* include/bits/stl_stack.h (uses_allocator<stack>): Likewise.

	* include/bits/stl_pair.h (piecewise_construct): Add.
	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust dg-error
	line number.
Jonathan Wakely - Sept. 27, 2010, 5:55 p.m.
Future and std::function both have allocator TODOs that might be simple.
Jonathan Wakely - Sept. 27, 2010, 7:14 p.m.
On 27 September 2010 18:55, Jonathan Wakely wrote:
> Future and std::function both have allocator TODOs that might be simple.

I've had a proper look and refreshed my memory, there's more work to
do for std::function, but it shouldn't be terribly difficult.  For
<future> I've already done most of the work so I'll uncomment that
code and write some tests to see if what I wrote actually works :-)

Patch

Index: include/bits/stl_queue.h
===================================================================
--- include/bits/stl_queue.h	(revision 164646)
+++ include/bits/stl_queue.h	(working copy)
@@ -307,6 +307,10 @@ 
     inline void
     swap(queue<_Tp, _Seq>& __x, queue<_Tp, _Seq>& __y)
     { __x.swap(__y); }
+
+  template<typename _Tp, typename _Seq, typename _Alloc>
+    struct uses_allocator<queue<_Tp, _Seq>, _Alloc>
+    : public uses_allocator<_Seq, _Alloc>::type { };
 #endif
 
   /**
@@ -536,6 +540,11 @@ 
     swap(priority_queue<_Tp, _Sequence, _Compare>& __x,
 	 priority_queue<_Tp, _Sequence, _Compare>& __y)
     { __x.swap(__y); }
+
+  template<typename _Tp, typename _Sequence, typename _Compare,
+	   typename _Alloc>
+    struct uses_allocator<priority_queue<_Tp, _Sequence, _Compare>, _Alloc>
+    : public uses_allocator<_Sequence, _Alloc>::type { };
 #endif
 
 _GLIBCXX_END_NAMESPACE
Index: include/bits/stl_stack.h
===================================================================
--- include/bits/stl_stack.h	(revision 164646)
+++ include/bits/stl_stack.h	(working copy)
@@ -282,6 +282,10 @@ 
     inline void
     swap(stack<_Tp, _Seq>& __x, stack<_Tp, _Seq>& __y)
     { __x.swap(__y); }
+
+  template<typename _Tp, typename _Seq, typename _Alloc>
+    struct uses_allocator<stack<_Tp, _Seq>, _Alloc>
+    : public uses_allocator<_Seq, _Alloc>::type { };
 #endif
 
 _GLIBCXX_END_NAMESPACE
Index: include/bits/stl_pair.h
===================================================================
--- include/bits/stl_pair.h	(revision 164646)
+++ include/bits/stl_pair.h	(working copy)
@@ -68,6 +68,9 @@ 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
   struct piecewise_construct_t { };
 
+  static const piecewise_construct_t piecewise_construct
+    = piecewise_construct_t();
+
   // forward declarations
   template<typename...>
     class tuple;
Index: include/bits/allocator.h
===================================================================
--- include/bits/allocator.h	(revision 164646)
+++ include/bits/allocator.h	(working copy)
@@ -47,6 +47,10 @@ 
 // Define the base class to std::allocator.
 #include <bits/c++allocator.h>
 
+#ifdef __GXX_EXPERIMENTAL_CXX0X__
+#include <type_traits>
+#endif
+
 _GLIBCXX_BEGIN_NAMESPACE(std)
 
   /**
@@ -177,28 +181,71 @@ 
     };
 
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
-   // A very basic implementation for now.  In general we have to wait for
-   // the availability of the infrastructure described in N2983:  we should
-   // try when either T has a move constructor which cannot throw or T is
-   // CopyContructible.
-   // NB: This code doesn't properly belong here, we should find a more
-   // suited place common to std::vector and std::deque.
-   template<typename _Tp,
-	    bool = __has_trivial_copy(typename _Tp::value_type)>
-     struct __shrink_to_fit
-     { static void _S_do_it(_Tp&) { } };
+  // A very basic implementation for now.  In general we have to wait for
+  // the availability of the infrastructure described in N2983:  we should
+  // try when either T has a move constructor which cannot throw or T is
+  // CopyContructible.
+  // NB: This code doesn't properly belong here, we should find a more
+  // suited place common to std::vector and std::deque.
+  template<typename _Tp,
+	   bool = __has_trivial_copy(typename _Tp::value_type)>
+    struct __shrink_to_fit
+    { static void _S_do_it(_Tp&) { } };
 
-   template<typename _Tp>
-     struct __shrink_to_fit<_Tp, true>
-     {
-       static void
-       _S_do_it(_Tp& __v)
-       {
-	 __try
-	   { _Tp(__v).swap(__v); }
-	 __catch(...) { }
-       }
-     };
+  template<typename _Tp>
+    struct __shrink_to_fit<_Tp, true>
+    {
+      static void
+      _S_do_it(_Tp& __v)
+      {
+	__try
+	  { _Tp(__v).swap(__v); }
+	__catch(...) { }
+      }
+    };
+
+
+  /// [allocator.tag]
+  struct allocator_arg_t { };
+
+  static const allocator_arg_t allocator_arg = allocator_arg_t();
+
+  template<typename _Tp>
+    class __has_allocator_type
+    : public __sfinae_types
+    {
+      template<typename _Up>
+        struct _Wrap_type
+	{ };
+
+      template<typename _Up>
+        static __one __test(_Wrap_type<typename _Up::allocator_type>*);
+
+      template<typename _Up>
+        static __two __test(...);
+
+    public:
+      static const bool __value = sizeof(__test<_Tp>(0)) == 1;
+    };
+
+  template<typename _Tp, typename _Alloc,
+	   bool = __has_allocator_type<_Tp>::__value>
+    struct __uses_allocator_helper
+    : public false_type { };
+
+  template<typename _Tp, typename _Alloc>
+    struct __uses_allocator_helper<_Tp, _Alloc, true>
+    : public integral_constant<bool, is_convertible<_Alloc,
+				     typename _Tp::allocator_type>::value>
+    { };
+
+  /// [allocator.uses.trait]
+  template<typename _Tp, typename _Alloc>
+    struct uses_allocator
+    : public integral_constant<bool,
+			       __uses_allocator_helper<_Tp, _Alloc>::value>
+    { };
+
 #endif
 
 _GLIBCXX_END_NAMESPACE
Index: testsuite/20_util/uses_allocator/value.cc
===================================================================
--- testsuite/20_util/uses_allocator/value.cc	(revision 0)
+++ testsuite/20_util/uses_allocator/value.cc	(revision 0)
@@ -0,0 +1,59 @@ 
+// { dg-options "-std=gnu++0x" }
+
+// 2010-09-27  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <memory>
+#include <testsuite_hooks.h>
+#include <testsuite_tr1.h>
+
+struct MyAlloc { };
+
+struct MyDerivedAlloc
+: public MyAlloc { };
+
+struct UA { };
+
+struct UB { typedef int             allocator_type; };
+
+struct UC { typedef MyAlloc         allocator_type; };
+
+struct UD { typedef MyDerivedAlloc  allocator_type; };
+
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+  using std::uses_allocator;
+  using namespace __gnu_test;
+
+  // Positive tests.
+  VERIFY( (test_relationship<uses_allocator, UC, MyAlloc>(true)) );
+  VERIFY( (test_relationship<uses_allocator, UC, MyDerivedAlloc>(true)));
+
+  // Negative tests.
+  VERIFY( (test_relationship<uses_allocator, UA, MyAlloc>(false)) );
+  VERIFY( (test_relationship<uses_allocator, UB, MyAlloc>(false)) );
+  VERIFY( (test_relationship<uses_allocator, UD, MyAlloc>(false)) );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
Index: testsuite/20_util/uses_allocator/requirements/typedefs.cc
===================================================================
--- testsuite/20_util/uses_allocator/requirements/typedefs.cc	(revision 0)
+++ testsuite/20_util/uses_allocator/requirements/typedefs.cc	(revision 0)
@@ -0,0 +1,33 @@ 
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// 2010-09-27  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <memory>
+
+void test01()
+{
+  // Check for required typedefs
+  typedef std::uses_allocator<int, int>       test_type;
+  typedef test_type::value_type               value_type;
+  typedef test_type::type                     type;
+  typedef test_type::type::value_type         type_value_type;
+  typedef test_type::type::type               type_type;
+}
Index: testsuite/20_util/uses_allocator/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/20_util/uses_allocator/requirements/explicit_instantiation.cc	(revision 0)
+++ testsuite/20_util/uses_allocator/requirements/explicit_instantiation.cc	(revision 0)
@@ -0,0 +1,29 @@ 
+// { dg-options "-std=gnu++0x" }
+// { dg-do compile }
+
+// 2010-09-27  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <memory>
+
+namespace std
+{
+  typedef short test_type;
+  template struct uses_allocator<test_type, test_type>;
+}
Index: testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
===================================================================
--- testsuite/20_util/weak_ptr/comparison/cmp_neg.cc	(revision 164646)
+++ testsuite/20_util/weak_ptr/comparison/cmp_neg.cc	(working copy)
@@ -48,4 +48,4 @@ 
 // { dg-warning "note" "" { target *-*-* } 1027 }
 // { dg-warning "note" "" { target *-*-* } 340 }
 // { dg-warning "note" "" { target *-*-* } 290 }
-// { dg-warning "note" "" { target *-*-* } 197 }
+// { dg-warning "note" "" { target *-*-* } 200 }