From 01d0f0f6adf7e3a340dd44690db5d7d7ed08d3e5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 17 Sep 2015 14:31:07 +0200
Subject: "unnamed namespaces don't work well yet" is no longer true

Change-Id: I7a04c2d04e3fc52982d83119755e0b349d232a47
---
 tools/source/fsys/urlobj.cxx   |  7 ++-----
 tools/source/inet/inetmime.cxx | 13 +++++--------
 2 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'tools/source')

diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index 65f451c78c6e..51887b7b722e 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.cxx
@@ -46,9 +46,6 @@
 #include <sax/tools/converter.hxx>
 #include <rtl/uri.hxx>
 
-namespace unnamed_tools_urlobj {} using namespace unnamed_tools_urlobj;
-    // unnamed namespaces don't work well yet...
-
 using namespace css;
 
 //  INetURLObject
@@ -420,7 +417,7 @@ inline void INetURLObject::appendEscape(OUStringBuffer & rTheText,
     rTheText.append( (sal_Unicode)INetMIME::getHexDigit(int(nOctet & 15)) );
 }
 
-namespace unnamed_tools_urlobj {
+namespace {
 
 enum
 {
@@ -616,7 +613,7 @@ std::unique_ptr<SvMemoryStream> INetURLObject::getData()
     return nullptr;
 }
 
-namespace unnamed_tools_urlobj {
+namespace {
 
 INetURLObject::FSysStyle guessFSysStyleByCounting(sal_Unicode const * pBegin,
                                                   sal_Unicode const * pEnd,
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 88e2cf9876db..44c0fdfc3ebe 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -27,10 +27,7 @@
 #include <tools/inetmime.hxx>
 #include <rtl/character.hxx>
 
-namespace unnamed_tools_inetmime {} using namespace unnamed_tools_inetmime;
-    // unnamed namespaces don't work well yet
-
-namespace unnamed_tools_inetmime {
+namespace {
 
 class Charset
 {
@@ -98,7 +95,7 @@ inline INetMIMECharsetList_Impl::Node::Node(const Charset & rTheCharset,
     m_pNext(pTheNext)
 {}
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 struct Parameter
 {
@@ -174,7 +171,7 @@ bool Charset::contains(sal_uInt32 nChar) const
 
 //  appendISO88591
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 void appendISO88591(OUString & rText, sal_Char const * pBegin,
                     sal_Char const * pEnd)
@@ -251,7 +248,7 @@ Parameter ** ParameterList::find(const OString& rAttribute,
 
 //  parseParameters
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 bool parseParameters(ParameterList const & rInput,
                      INetContentTypeParameterList * pOutput)
@@ -1025,7 +1022,7 @@ const sal_Char * INetMIME::getCharsetName(rtl_TextEncoding eEncoding)
         }
 }
 
-namespace unnamed_tools_inetmime {
+namespace {
 
 struct EncodingEntry
 {
-- 
cgit