Use forward declarations to avoid pulling in the whole world when it is not necessary.

2 files changed, 4 insertions, 10 deletions

diff --git a/storageframework/src/vespa/storageframework/generic/component/component.h b/storageframework/src/vespa/storageframework/generic/component/component.h
index 5ce86292f7d..95096e23653 100644
--- a/storageframework/src/vespa/storageframework/generic/component/component.h
+++ b/storageframework/src/vespa/storageframework/generic/component/component.h
@@ -74,8 +74,7 @@
 #include <vespa/vespalib/util/sync.h>
 #include <atomic>
 
-namespace storage {
-namespace framework {
+namespace storage::framework {
 
 class ComponentRegister;
 
@@ -217,6 +216,4 @@ public:
 
 };
 
-} // framework
-} // storage
-
+}
diff --git a/storageframework/src/vespa/storageframework/generic/thread/runnable.h b/storageframework/src/vespa/storageframework/generic/thread/runnable.h
index 0e6186b546a..f7b295d785b 100644
--- a/storageframework/src/vespa/storageframework/generic/thread/runnable.h
+++ b/storageframework/src/vespa/storageframework/generic/thread/runnable.h
@@ -11,8 +11,7 @@
 
 #include <vespa/storageframework/generic/clock/time.h>
 
-namespace storage {
-namespace framework {
+namespace storage::framework {
 
 /**
  * A cycle type can be given when registering ticks. This is useful for
@@ -63,6 +62,4 @@ struct Runnable {
     virtual void run(ThreadHandle&) = 0;
 };
 
-} // framework
-} // storage
-
+} // storage::framework