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

future.cc (future_category): Export compatibility symbol.

Browse source 
2010-12-02  Jonathan Wakely  <jwakely.gcc@gmail.com>

	* src/future.cc (future_category): Export compatibility symbol.
	* config/abi/pre/gnu.ver: Move _ZSt15future_categoryv to 3.4.15
	version.

From-SVN: r167394
This commit is contained in:
Jonathan Wakely 2010-12-02 22:18:11 +00:00 • committed by Jonathan Wakely
parent 0370b27c16
commit 5b824b7616
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,9 @@
2010-12-02 Jonathan Wakely <jwakely.gcc@gmail.com>
* src/future.cc (future_category): Export compatibility symbol.
* config/abi/pre/gnu.ver: Move _ZSt15future_categoryv to 3.4.15
version.
2010-12-02 François Dumont <francois.cppdevs@free.fr> 2010-12-02 François Dumont <francois.cppdevs@free.fr>
* testsuite/23_containers/vector/requirements/explicit_instantiation/ * testsuite/23_containers/vector/requirements/explicit_instantiation/

10
libstdc++-v3/config/abi/pre/gnu.ver
View file

@ -1107,7 +1107,6 @@ GLIBCXX_3.4.14 {
_ZNSt9__atomic011atomic_flag5clearESt12memory_order; _ZNSt9__atomic011atomic_flag5clearESt12memory_order;
# future # future
_ZSt15future_category;
_ZNSt12future_errorD*; _ZNSt12future_errorD*;
_ZNKSt12future_error4whatEv; _ZNKSt12future_error4whatEv;
_ZTSSt12future_error; _ZTSSt12future_error;
@ -1115,6 +1114,9 @@ GLIBCXX_3.4.14 {
_ZTISt12future_error; _ZTISt12future_error;
_ZSt20__throw_future_errori; _ZSt20__throw_future_errori;
# GLIBCXX_ABI compatibility only.
_ZSt15future_category;
# string|wstring ::cbegin member functions # string|wstring ::cbegin member functions
_ZNKSs6cbeginEv; _ZNKSs6cbeginEv;
_ZNKSs4cendEv; _ZNKSs4cendEv;
@ -1191,14 +1193,10 @@ GLIBCXX_3.4.15 {
__emutls_v._ZSt11__once_call; __emutls_v._ZSt11__once_call;
__emutls_v._ZSt15__once_callable; __emutls_v._ZSt15__once_callable;
} GLIBCXX_3.4.14;
GLIBCXX_3.4.16 {
# std::future_category is now a function # std::future_category is now a function
_ZSt15future_categoryv; _ZSt15future_categoryv;
} GLIBCXX_3.4.15; } GLIBCXX_3.4.14;
# Symbols in the support library (libsupc++) have their own tag. # Symbols in the support library (libsupc++) have their own tag.
CXXABI_1.3 { CXXABI_1.3 {

20
libstdc++-v3/src/future.cc
View file

@ -75,3 +75,23 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
future_error::what() const throw() { return _M_code.message().c_str(); } future_error::what() const throw() { return _M_code.message().c_str(); }
_GLIBCXX_END_NAMESPACE _GLIBCXX_END_NAMESPACE
// XXX GLIBCXX_ABI Deprecated
// gcc-4.6.0
// <future> export changes
#if defined(_GLIBCXX_SYMVER_GNU) && defined(PIC) \
&& defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
&& defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
namespace __gnu_cxx
{
const std::error_category* future_category = &__future_category_instance();
}
#define _GLIBCXX_ASM_SYMVER(cur, old, version) \
asm (".symver " #cur "," #old "@@@" #version);
_GLIBCXX_ASM_SYMVER(_ZN9__gnu_cxx15future_categoryE, _ZSt15future_category, GLIBCXX_3.4.14)
#endif