From 5345a1906a5dbdcbc7c528cb2400a4e78b441b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Dumont?= Date: Thu, 12 Dec 2019 07:23:34 +0000 Subject: 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 --- libstdc++-v3/include/tr1/cstdio | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libstdc++-v3/include/tr1/cstdio') diff --git a/libstdc++-v3/include/tr1/cstdio b/libstdc++-v3/include/tr1/cstdio index 7d72e58..f8a9182 100644 --- a/libstdc++-v3/include/tr1/cstdio +++ b/libstdc++-v3/include/tr1/cstdio @@ -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 -- cgit v1.1