Implement LWG 2769, Redundant const in the return type of any_cast(const any&).

Implement LWG 2769, Redundant const in the return type of
any_cast(const any&).
* include/std/any (_AnyCast): New.
(any_cast(const any&)): Use it and add an explicit cast for return.
(any_cast(any&)): Likewise.
(any_cast(any&&)): Likewise.
* testsuite/20_util/any/misc/any_cast.cc: Add a test for a type
that has an explicit copy constructor.
*testsuite/20_util/any/misc/any_cast_neg.cc: Adjust.

From-SVN: r243739

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cbed9d881c701be4c012e34e537328bea682697a..a0804e7d92035ba4c654c00119048d52f246f743 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2016-12-16  Ville Voutilainen  <ville.voutilainen@gmail.com>
+
+       Implement LWG 2769, Redundant const in the return type of
+       any_cast(const any&).
+       * include/std/any (_AnyCast): New.
+       (any_cast(const any&)): Use it and add an explicit cast for return.
+       (any_cast(any&)): Likewise.
+       (any_cast(any&&)): Likewise.
+       * testsuite/20_util/any/misc/any_cast.cc: Add a test for a type
+       that has an explicit copy constructor.
+       * testsuite/20_util/any/misc/any_cast_neg.cc: Adjust.
+
 2016-12-15  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/59170

diff --git a/libstdc++-v3/include/std/any b/libstdc++-v3/include/std/any
index ded2bb275222f27d2e3cad25456e044db15f466d..44546e18c0f1aa83ff1bdbd9b55fcfe0e838b38b 100644 (file)
--- a/libstdc++-v3/include/std/any
+++ b/libstdc++-v3/include/std/any
@@ -433,6 +433,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
       return any(in_place_type<_Tp>, __il, std::forward<_Args>(__args)...);
     }
 
+  template <typename _Tp>
+    using _AnyCast = remove_cv_t<remove_reference_t<_Tp>>;
   /**
    * @brief Access the contained object.
    *
@@ -448,9 +450,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       static_assert(any::__is_valid_cast<_ValueType>(),
          "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<add_const_t<remove_reference_t<_ValueType>>>(&__any);
+      auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
       if (__p)
-       return *__p;
+       return static_cast<_ValueType>(*__p);
       __throw_bad_any_cast();
     }
 
@@ -471,9 +473,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       static_assert(any::__is_valid_cast<_ValueType>(),
          "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<remove_reference_t<_ValueType>>(&__any);
+      auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
       if (__p)
-       return *__p;
+       return static_cast<_ValueType>(*__p);
       __throw_bad_any_cast();
     }
 
@@ -485,9 +487,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       static_assert(any::__is_valid_cast<_ValueType>(),
          "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<remove_reference_t<_ValueType>>(&__any);
+      auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
       if (__p)
-       return *__p;
+       return static_cast<_ValueType>(*__p);
       __throw_bad_any_cast();
     }
 
@@ -499,9 +501,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     {
       static_assert(any::__is_valid_cast<_ValueType>(),
          "Template argument must be a reference or CopyConstructible type");
-      auto __p = any_cast<remove_reference_t<_ValueType>>(&__any);
+      auto __p = any_cast<_AnyCast<_ValueType>>(&__any);
       if (__p)
-       return std::move(*__p);
+       return static_cast<_ValueType>(std::move(*__p));
       __throw_bad_any_cast();
     }
   // @}

diff --git a/libstdc++-v3/testsuite/20_util/any/misc/any_cast.cc b/libstdc++-v3/testsuite/20_util/any/misc/any_cast.cc
index 96f9419e070399082ba8fce4ed818a8c1008350c..f3ae5927904285f72b89457071ff556652e29692 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/any/misc/any_cast.cc
+++ b/libstdc++-v3/testsuite/20_util/any/misc/any_cast.cc
@@ -106,9 +106,22 @@ void test03()
   MoveDeleted&& md3 = any_cast<MoveDeleted&&>(any(std::move(md)));
 }
 
+void test04()
+{
+  struct ExplicitCopy
+  {
+    ExplicitCopy() = default;
+    explicit ExplicitCopy(const ExplicitCopy&) = default;
+  };
+  any x = ExplicitCopy();
+  ExplicitCopy ec{any_cast<ExplicitCopy>(x)};
+  ExplicitCopy ec2{any_cast<ExplicitCopy>(std::move(x))};
+}
+
 int main()
 {
   test01();
   test02();
   test03();
+  test04();
 }

diff --git a/libstdc++-v3/testsuite/20_util/any/misc/any_cast_neg.cc b/libstdc++-v3/testsuite/20_util/any/misc/any_cast_neg.cc
index 4de400d717ef62735dd7cc0a9a5b016206b43143..a8a1ca9fd0abfcd6c5351123a662b855efb6f7c7 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/any/misc/any_cast_neg.cc
+++ b/libstdc++-v3/testsuite/20_util/any/misc/any_cast_neg.cc
@@ -26,5 +26,5 @@ void test01()
   using std::any_cast;
 
   const any y(1);
-  any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 453 }
+  any_cast<int&>(y); // { dg-error "invalid static_cast" "" { target { *-*-* } } 455 }
 }