diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2011-09-27 00:02:54 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2011-09-27 00:02:54 +0000 |
| commit | 2799d9729358b527be72986976d98cae55be4707 (patch) | |
| tree | c7e5cfc13b50c93a7499aad398a80645438df998 /libstdc++-v3/include/c_global | |
| parent | 59d605ad393aad35059e056816d9ebd4b4a19a7d (diff) | |
| download | gcc-2799d9729358b527be72986976d98cae55be4707.zip gcc-2799d9729358b527be72986976d98cae55be4707.tar.gz gcc-2799d9729358b527be72986976d98cae55be4707.tar.bz2 | |
re PR libstdc++/48698 (gnu-versioned-namespace problems)
2011-09-26 Benjamin Kosnik <bkoz@redhat.com
Jonathan Wakely <jwakely.gcc@gmail.com>
PR libstdc++/48698
* acinclude.m4 (GLIBCXX_ENABLE_SYMVERS): Set libtool_VERSION here.
* configure.ac: Move AC_SUBST of libtool_VERSION past call to
GLIBCXX_ENABLE_SYMVERS.
* configure: Regenerate.
* include/bits/c++config: Use __7 as versioned namespace name.
* config/abi/pre/gnu-versioned-namespace.ver: Change mangling as
per above.
* include/c_global/cwchar: Adjust nested namespaces.
* testsuite/20_util/bind/48698.cc: Add test case.
* testsuite/ext/profile/mutex_extensions_neg.cc: Change line number.
From-SVN: r179221
Diffstat (limited to 'libstdc++-v3/include/c_global')
| -rw-r--r-- | libstdc++-v3/include/c_global/cwchar | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/c_global/cwchar b/libstdc++-v3/include/c_global/cwchar index 5a33965..a2b1168 100644 --- a/libstdc++-v3/include/c_global/cwchar +++ b/libstdc++-v3/include/c_global/cwchar @@ -136,6 +136,8 @@ namespace std namespace std _GLIBCXX_VISIBILITY(default) { +_GLIBCXX_BEGIN_NAMESPACE_VERSION + using ::wint_t; using ::btowc; @@ -207,8 +209,6 @@ namespace std _GLIBCXX_VISIBILITY(default) using ::wcsstr; using ::wmemchr; -_GLIBCXX_BEGIN_NAMESPACE_VERSION - #ifndef __CORRECT_ISO_CPP_WCHAR_H_PROTO inline wchar_t* wcschr(wchar_t* __p, wchar_t __c) |