Remove obsolete ZEEK_FORWARD_DECLARE_NAMESPACED macros

src/logging/Component.h

@@ -6,11 +6,11 @@
 #include "zeek/plugin/Component.h"
 #include "zeek/plugin/TaggedComponent.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(WriterFrontend, zeek, logging);
-ZEEK_FORWARD_DECLARE_NAMESPACED(WriterBackend, zeek, logging);
-
 namespace zeek::logging {
 
+class WriterFrontend;
+class WriterBackend;
+
 /**
  * Component description for plugins providing log writers.
  */

src/logging/Manager.h

@@ -15,14 +15,15 @@
 #include "zeek/logging/WriterBackend.h"
 
 namespace broker { struct endpoint_info; }
-ZEEK_FORWARD_DECLARE_NAMESPACED(SerializationFormat, zeek::detail);
-
-ZEEK_FORWARD_DECLARE_NAMESPACED(WriterFrontend, zeek, logging);
-ZEEK_FORWARD_DECLARE_NAMESPACED(RotationFinishedMessage, zeek, logging);
 
 namespace zeek {
+
+namespace detail { class SerializationFormat; }
+
 namespace logging {
 
+class WriterFrontend;
+class RotationFinishedMessage;
 class RotationTimer;
 
 /**

src/logging/Tag.h

@@ -5,17 +5,21 @@
 #include "zeek/zeek-config.h"
 #include "zeek/Tag.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
+namespace zeek {
 
-namespace zeek::plugin {
-	template <class T> class TaggedComponent;
-	template <class T, class C> class ComponentManager;
-}
+class EnumVal;
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, logging);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, logging);
+namespace plugin {
 
-namespace zeek::logging {
+template <class T> class TaggedComponent;
+template <class T, class C> class ComponentManager;
+
+} // namespace plugin
+
+namespace logging {
+
+class Manager;
+class Component;
 
 /**
  * Class to identify a writer type.
@@ -114,4 +118,5 @@ protected:
 	explicit Tag(EnumValPtr val);
 };
 
-} // namespace zeek::logging
+} // namespace logging
+} // namespace zeek

src/logging/WriterBackend.h

@@ -9,10 +9,10 @@
 
 namespace broker { class data; }
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(WriterFrontend, zeek, logging);
-
 namespace zeek::logging {
 
+class WriterFrontend;
+
 /**
  * Base class for writer implementation. When the logging::Manager creates a
  * new logging filter, it instantiates a WriterFrontend. That then in turn

src/logging/WriterFrontend.h

@@ -4,10 +4,10 @@
 
 #include "zeek/logging/WriterBackend.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, logging);
-
 namespace zeek::logging  {
 
+class Manager;
+
 /**
  * Bridge class between the logging::Manager and backend writer threads. The
  * Manager instantiates one \a WriterFrontend for each open logging filter.