diff options
| author | François Dumont <fdumont@gcc.gnu.org> | 2019-12-12 07:23:34 +0000 |
|---|---|---|
| committer | François Dumont <fdumont@gcc.gnu.org> | 2019-12-12 07:23:34 +0000 |
| commit | 5345a1906a5dbdcbc7c528cb2400a4e78b441b0e (patch) | |
| tree | 5b159c0d3cf0ed5d49a6dd8baa1dfb7e5af55e74 /libstdc++-v3/include/tr1/cinttypes | |
| parent | 8bc1995989018df93c5cdb99179f732b9d511e0c (diff) | |
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
Diffstat (limited to 'libstdc++-v3/include/tr1/cinttypes')
| -rw-r--r-- | libstdc++-v3/include/tr1/cinttypes | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libstdc++-v3/include/tr1/cinttypes b/libstdc++-v3/include/tr1/cinttypes index e665e188289..1c08166efdc 100644 --- a/libstdc++-v3/include/tr1/cinttypes +++ b/libstdc++-v3/include/tr1/cinttypes @@ -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 |