diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2006-10-17 11:56:21 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2006-10-17 11:56:21 +0000 |
| commit | 46db415941fcc2edcfdb7d9de4480484ce28b76f (patch) | |
| tree | 85502d16217ebc971d63c61ffa4e0143fa5ed212 /libstdc++-v3/src/ext-inst.cc | |
| parent | e4fd3c844119075907e31d9f0179e7be661dbe95 (diff) | |
| download | gcc-46db415941fcc2edcfdb7d9de4480484ce28b76f.zip gcc-46db415941fcc2edcfdb7d9de4480484ce28b76f.tar.gz gcc-46db415941fcc2edcfdb7d9de4480484ce28b76f.tar.bz2 | |
re PR libstdc++/28514 (libstdc++ vs. anonymous namespaces)
2006-10-17 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/28514
* include/bits/cpp_type_traits.h (__detail): Uglify namespace.
* include/ext/rope: Remove global-scope anonymous namespace, use
nested __detail. Fixup resulting formatting issues.
* include/ext/ropeimpl.h: Same.
* include/tr1/hashtable_policy.h: Remove anonymous namespace
nesting for __detail.
* include/tr1/random: Revert anonymous namespace to nested
__detail namespace.
* include/tr1/random.tcc: Same.
* src/ext-inst.cc: Fixups for above.
From-SVN: r117824
Diffstat (limited to 'libstdc++-v3/src/ext-inst.cc')
| -rw-r--r-- | libstdc++-v3/src/ext-inst.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/src/ext-inst.cc b/libstdc++-v3/src/ext-inst.cc index 1e356d6..7f98b41 100644 --- a/libstdc++-v3/src/ext-inst.cc +++ b/libstdc++-v3/src/ext-inst.cc @@ -34,13 +34,13 @@ #include <ext/rope> #include <ext/stdio_filebuf.h> -namespace -{ - const int min_len = _S_max_rope_depth + 1; -} - _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) + namespace + { + const int min_len = __detail::_S_max_rope_depth + 1; + } + template const unsigned long rope<char, std::allocator<char> >::_S_min_len[min_len]; |