Concatenate nested namespaces

5 files changed, 10 insertions, 20 deletions

diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index 68252fe4..516b7cf4 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -33,8 +33,7 @@
 
 #include <memory>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class RunContext;
 
@@ -92,5 +91,4 @@ BlockDelayNode::run(RunContext& ctx)
 }
 
 } // namespace internals
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index ccc6df01..898bd55b 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -41,8 +41,7 @@
 #include <initializer_list>
 #include <memory>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class GraphImpl;
 
@@ -184,5 +183,4 @@ ControllerNode::control(RunContext& ctx, uint8_t control_num, uint8_t val, Frame
 }
 
 } // namespace internals
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 976e43f9..dd202451 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -44,8 +44,7 @@
 
 // #define NOTE_DEBUG 1
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class GraphImpl;
 
@@ -436,5 +435,4 @@ NoteNode::channel_pressure(RunContext& ctx, FrameTime time, float amount)
 }
 
 } // namespace internals
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp
index 651a2f36..ee97ac84 100644
--- a/src/server/internals/Time.cpp
+++ b/src/server/internals/Time.cpp
@@ -38,8 +38,7 @@
 
 #include <memory>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class GraphImpl;
 
@@ -87,5 +86,4 @@ TimeNode::run(RunContext& ctx)
 }
 
 } // namespace internals
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 89a970fc..519b6d9f 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -41,8 +41,7 @@
 #include <cmath>
 #include <memory>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class GraphImpl;
 
@@ -198,5 +197,4 @@ TriggerNode::note_off(RunContext& ctx, uint8_t note_num, FrameTime time)
 }
 
 } // namespace internals
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server