OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++: Fix tr1 definition ambiguity in versioned namespace 

* include/tr1/cctype: Add _GLIBCXX_BEGIN_VERSION_NAMESPACE and
	_GLIBCXX_END_VERSION_NAMESPACE.
	* include/tr1/cfenv: Likewise.
	* include/tr1/cinttypes: Likewise.
	* include/tr1/cstdint: Likewise.
	* include/tr1/cstdio: Likewise.
	* include/tr1/cstdlib: Likewise.
	* include/tr1/cwchar: Likewise.
	* include/tr1/cwctype: Likewise.

From-SVN: r279272
This commit is contained in:
François Dumont 2019-12-12 07:23:34 +00:00
parent 8bc1995989
commit 5345a1906a
9 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,15 @@
2019-12-12 François Dumont <fdumont@gcc.gnu.org>
* include/tr1/cctype: Add _GLIBCXX_BEGIN_VERSION_NAMESPACE and
_GLIBCXX_END_VERSION_NAMESPACE.
* include/tr1/cfenv: Likewise.
* include/tr1/cinttypes: Likewise.
* include/tr1/cstdint: Likewise.
* include/tr1/cstdio: Likewise.
* include/tr1/cstdlib: Likewise.
* include/tr1/cwchar: Likewise.
* include/tr1/cwctype: Likewise.
* src/c++11/random.cc: Include <cctype>.
(random_devise::_M_init_pretr1): Qualify isdigit call.

4
libstdc++-v3/include/tr1/cctype
View File

@ -38,10 +38,14 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
using ::isblank;
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif

4
libstdc++-v3/include/tr1/cfenv
View File

@ -53,6 +53,8 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
// types
@ -74,6 +76,8 @@ namespace tr1
using ::fesetenv;
using ::feupdateenv;
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif // _GLIBCXX_USE_C99_FENV_TR1

4
libstdc++-v3/include/tr1/cinttypes
View File

@ -50,6 +50,8 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
// types
@ -77,6 +79,8 @@ namespace tr1
using ::wcstoumax;
#endif
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif // _GLIBCXX_USE_C99_INTTYPES_TR1

2
libstdc++-v3/include/tr1/cstdint
View File

@ -58,6 +58,7 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
using ::int8_t;
@ -96,6 +97,7 @@ namespace tr1
using ::uintmax_t;
using ::uintptr_t;
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif // _GLIBCXX_USE_C99_STDINT_TR1

4
libstdc++-v3/include/tr1/cstdio
View File

@ -37,6 +37,8 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
using std::snprintf;
@ -46,6 +48,8 @@ namespace tr1
using std::vscanf;
using std::vsscanf;
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif

4
libstdc++-v3/include/tr1/cstdlib
View File

@ -39,6 +39,8 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
#if !_GLIBCXX_USE_C99_LONG_LONG_DYNAMIC
@ -63,6 +65,8 @@ namespace tr1
using std::div;
#endif
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif // _GLIBCXX_USE_C99_STDLIB

4
libstdc++-v3/include/tr1/cwchar
View File

@ -37,6 +37,8 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
#if _GLIBCXX_HAVE_WCSTOF
@ -58,6 +60,8 @@ namespace tr1
using std::wcstoull;
#endif
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif // _GLIBCXX_USE_WCHAR_T

4
libstdc++-v3/include/tr1/cwctype
View File

@ -37,12 +37,16 @@
namespace std _GLIBCXX_VISIBILITY(default)
{
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace tr1
{
#if _GLIBCXX_HAVE_ISWBLANK
using std::iswblank;
#endif
}
_GLIBCXX_END_NAMESPACE_VERSION
}
#endif // _GLIBCXX_USE_WCHAR_T