@@ -361,17 +361,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp>
void cref(const _Tp&&) = delete;
- /// Partial specialization.
+ /// std::ref overload to prevent wrapping a reference_wrapper
template<typename _Tp>
inline reference_wrapper<_Tp>
ref(reference_wrapper<_Tp> __t) noexcept
- { return ref(__t.get()); }
+ { return __t; }
- /// Partial specialization.
+ /// std::cref overload to prevent wrapping a reference_wrapper
template<typename _Tp>
inline reference_wrapper<const _Tp>
cref(reference_wrapper<_Tp> __t) noexcept
- { return cref(__t.get()); }
+ { return { __t.get() }; }
// @} group functors
new file mode 100644
@@ -0,0 +1,34 @@
+// Copyright (C) 2017 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/>.
+
+// { dg-do compile { target c++11 } }
+
+#include <functional>
+
+namespace X {
+ struct Y { };
+ template<typename T> void ref(T) { }
+ template<typename T> void cref(T) { }
+}
+
+int main()
+{
+ X::Y i;
+ std::reference_wrapper<X::Y> r(i);
+ ref(r);
+ cref(r);
+}