From e01b9e772637bbb3b6d856bd0288fb9691bc234d Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Mon, 14 Jan 2019 14:20:50 +0100
Subject: Use C++17 nested namespace definitions (in binaryurp)

Change-Id: I21594a9fec47ac4a0dd1b821a6b47ea468445c42
Reviewed-on: https://gerrit.libreoffice.org/66295
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 binaryurp/source/binaryany.hxx      |  4 +---
 binaryurp/source/bridge.hxx         |  4 ++--
 binaryurp/source/bridgefactory.hxx  |  4 ++--
 binaryurp/source/currentcontext.cxx |  6 +-----
 binaryurp/source/currentcontext.hxx | 10 ++--------
 binaryurp/source/lessoperators.cxx  |  4 ++--
 binaryurp/source/lessoperators.hxx  |  8 +++-----
 binaryurp/source/proxy.hxx          |  4 +---
 binaryurp/source/unmarshal.hxx      |  4 +---
 9 files changed, 15 insertions(+), 33 deletions(-)

(limited to 'binaryurp')

diff --git a/binaryurp/source/binaryany.hxx b/binaryurp/source/binaryany.hxx
index 7b4a9011a256..8422ca1ac424 100644
--- a/binaryurp/source/binaryany.hxx
+++ b/binaryurp/source/binaryany.hxx
@@ -24,9 +24,7 @@
 
 #include <uno/any2.h>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class TypeDescription;
-} } } }
+namespace com::sun::star::uno { class TypeDescription; }
 
 namespace binaryurp {
 
diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx
index a258f331639e..4572e7e573c2 100644
--- a/binaryurp/source/bridge.hxx
+++ b/binaryurp/source/bridge.hxx
@@ -50,7 +50,7 @@ namespace binaryurp {
     class Proxy;
     class Reader;
 }
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace bridge { class XInstanceProvider; }
     namespace connection { class XConnection; }
     namespace lang { class XEventListener; }
@@ -60,7 +60,7 @@ namespace com { namespace sun { namespace star {
         class UnoInterfaceReference;
         class XInterface;
     }
-} } }
+}
 namespace rtl { class ByteSequence; }
 
 namespace binaryurp {
diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx
index 048cbb8deeaf..1a83962ee6b7 100644
--- a/binaryurp/source/bridgefactory.hxx
+++ b/binaryurp/source/bridgefactory.hxx
@@ -35,13 +35,13 @@
 #include <cppuhelper/compbase.hxx>
 #include <sal/types.h>
 
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
     namespace connection { class XConnection; }
     namespace uno {
         class XComponentContext;
         class XInterface;
     }
-} } }
+}
 
 namespace binaryurp {
 
diff --git a/binaryurp/source/currentcontext.cxx b/binaryurp/source/currentcontext.cxx
index 510f2509486b..56c3306aae29 100644
--- a/binaryurp/source/currentcontext.cxx
+++ b/binaryurp/source/currentcontext.cxx
@@ -30,9 +30,7 @@
 
 #include "currentcontext.hxx"
 
-namespace binaryurp {
-
-namespace current_context {
+namespace binaryurp::current_context {
 
 css::uno::UnoInterfaceReference get() {
     css::uno::UnoInterfaceReference cc;
@@ -57,6 +55,4 @@ void set(css::uno::UnoInterfaceReference const & value) {
 
 }
 
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/currentcontext.hxx b/binaryurp/source/currentcontext.hxx
index 2a929bf294f8..95600e62d713 100644
--- a/binaryurp/source/currentcontext.hxx
+++ b/binaryurp/source/currentcontext.hxx
@@ -22,13 +22,9 @@
 
 #include <sal/config.h>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class UnoInterfaceReference;
-} } } }
+namespace com::sun::star::uno { class UnoInterfaceReference; }
 
-namespace binaryurp {
-
-namespace current_context {
+namespace binaryurp::current_context {
 
 com::sun::star::uno::UnoInterfaceReference get();
 
@@ -36,8 +32,6 @@ void set(com::sun::star::uno::UnoInterfaceReference const & value);
 
 }
 
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binaryurp/source/lessoperators.cxx b/binaryurp/source/lessoperators.cxx
index 98857171f108..acab8117583f 100644
--- a/binaryurp/source/lessoperators.cxx
+++ b/binaryurp/source/lessoperators.cxx
@@ -30,7 +30,7 @@
 
 #include "lessoperators.hxx"
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
 
 bool operator <(TypeDescription const & left, TypeDescription const & right) {
     assert(left.is() && right.is());
@@ -42,7 +42,7 @@ bool operator <(TypeDescription const & left, TypeDescription const & right) {
           OUString::unacquired(&right.get()->pTypeName)));
 }
 
-} } } }
+}
 
 namespace rtl {
 
diff --git a/binaryurp/source/lessoperators.hxx b/binaryurp/source/lessoperators.hxx
index 8090db850e66..65f2c5366ca3 100644
--- a/binaryurp/source/lessoperators.hxx
+++ b/binaryurp/source/lessoperators.hxx
@@ -22,16 +22,14 @@
 
 #include <sal/config.h>
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class TypeDescription;
-} } } }
+namespace com::sun::star::uno { class TypeDescription; }
 namespace rtl { class ByteSequence; }
 
-namespace com { namespace sun { namespace star { namespace uno {
+namespace com::sun::star::uno {
 
 bool operator <(TypeDescription const & left, TypeDescription const & right);
 
-} } } }
+}
 
 namespace rtl {
 
diff --git a/binaryurp/source/proxy.hxx b/binaryurp/source/proxy.hxx
index 238685d4e4be..d4a94cd02f48 100644
--- a/binaryurp/source/proxy.hxx
+++ b/binaryurp/source/proxy.hxx
@@ -33,9 +33,7 @@
 #include <uno/dispatcher.h>
 
 namespace binaryurp { class Bridge; }
-namespace com { namespace sun { namespace star { namespace uno {
-    class UnoInterfaceReference;
-} } } }
+namespace com::sun::star::uno { class UnoInterfaceReference; }
 
 namespace binaryurp {
 
diff --git a/binaryurp/source/unmarshal.hxx b/binaryurp/source/unmarshal.hxx
index 86378497a372..6867d8b17beb 100644
--- a/binaryurp/source/unmarshal.hxx
+++ b/binaryurp/source/unmarshal.hxx
@@ -34,9 +34,7 @@ namespace binaryurp {
     class Bridge;
     struct ReaderState;
 }
-namespace com { namespace sun { namespace star { namespace uno {
-    class TypeDescription;
-} } } }
+namespace com::sun::star::uno { class TypeDescription; }
 
 namespace binaryurp {
 
-- 
cgit