This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3 patch] Fix friend declaration so it is visible to name lookup
- From: Jonathan Wakely <jwakely at redhat dot com>
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Thu, 20 Aug 2015 21:21:00 +0100
- Subject: [v3 patch] Fix friend declaration so it is visible to name lookup
- Authentication-results: sourceware.org; auth=none
Jason pointed out this isn't valid, and is going to fail to compile
soon with a fix he's making.
Tested powerpc64le-linux, committed to trunk.
commit 89c676b9c2008823e7bbb7d5db615d908b1ea27d
Author: Jonathan Wakely <jwakely@redhat.com>
Date: Thu Aug 20 20:51:39 2015 +0100
* include/experimental/any (__any_caster): Define at namespace scope
so the name is visible to name lookup.
* testsuite/experimental/any/misc/any_cast_neg.cc: Adjust dg-error.
diff --git a/libstdc++-v3/include/experimental/any b/libstdc++-v3/include/experimental/any
index dae82b5..4cdc1dc 100644
--- a/libstdc++-v3/include/experimental/any
+++ b/libstdc++-v3/include/experimental/any
@@ -296,14 +296,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Storage _M_storage;
template<typename _Tp>
- friend void* __any_caster(const any* __any)
- {
- if (__any->_M_manager != &_Manager<decay_t<_Tp>>::_S_manage)
- return nullptr;
- _Arg __arg;
- __any->_M_manager(_Op_access, __any, &__arg);
- return __arg._M_obj;
- }
+ friend void* __any_caster(const any* __any);
// Manage in-place contained object.
template<typename _Tp>
@@ -396,6 +389,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
// @}
+ template<typename _Tp>
+ void* __any_caster(const any* __any)
+ {
+ if (__any->_M_manager != &any::_Manager<decay_t<_Tp>>::_S_manage)
+ return nullptr;
+ any::_Arg __arg;
+ __any->_M_manager(any::_Op_access, __any, &__arg);
+ return __arg._M_obj;
+ }
+
/**
* @brief Access the contained object.
*
diff --git a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc
index 1d1180c..5c7595d 100644
--- a/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc
+++ b/libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc
@@ -26,5 +26,5 @@ void test01()
using std::experimental::any_cast;
const any y(1);
- any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 360 }
+ any_cast<int&>(y); // { dg-error "qualifiers" "" { target { *-*-* } } 353 }
}