FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

any (__any_caster): Define at namespace scope so the name is visible to name lookup.

Browse source 
* 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.

From-SVN: r227042
This commit is contained in:
Jonathan Wakely 2015-08-20 21:19:58 +01:00 • committed by Jonathan Wakely
parent 92695fbb29
commit 89f0694859
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View file

@ -1,5 +1,9 @@
2015-08-20 Jonathan Wakely <jwakely@redhat.com>
* 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.
* python/Makefile.am: Ensure gdb.py is installed for libstdc++ not
libstdc++fs.
* python/Makefile.in: Regenerate.

19
libstdc++-v3/include/experimental/any
View file

@ -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.
*

2
libstdc++-v3/testsuite/experimental/any/misc/any_cast_neg.cc
View file

@ -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 }
}