Remove obsolete ZEEK_FORWARD_DECLARE_NAMESPACED macros

src/file_analysis/Analyzer.h

@@ -6,15 +6,14 @@
 
 #include "zeek/file_analysis/Tag.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
 namespace zeek {
+
+class RecordVal;
 using RecordValPtr = IntrusivePtr<RecordVal>;
-}
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
-
-namespace zeek::file_analysis {
+namespace file_analysis {
 
+class File;
 using ID = uint32_t;
 
 /**
@@ -175,4 +174,5 @@ private:
 	static ID id_counter;
 };
 
-} // namespace zeek::file_analysis
+} // namespace file_analysis
+} // namespace zeek

src/file_analysis/AnalyzerSet.h

@@ -8,16 +8,19 @@
 #include "zeek/Dict.h"
 #include "zeek/file_analysis/Tag.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(CompositeHash, zeek::detail);
-ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
 namespace zeek {
+
+class RecordVal;
 using RecordValPtr = IntrusivePtr<RecordVal>;
-}
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, file_analysis);
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
+namespace detail { class CompositeHash; }
 
-namespace zeek::file_analysis::detail {
+namespace file_analysis {
+
+class Analyzer;
+class File;
+
+namespace detail {
 
 /**
  * A set of file analysis analyzers indexed by an \c AnalyzerArgs (script-layer
@@ -237,4 +240,6 @@ private:
 	ModQueue mod_queue;	/**< A queue of analyzer additions/removals requests. */
 };
 
-} // namespace zeek::file_analysis::detail
+} // namespace detail
+} // namespace file_analysis
+} // namespace zeek

src/file_analysis/Component.h

@@ -8,16 +8,16 @@
 #include "zeek/plugin/Component.h"
 #include "zeek/plugin/TaggedComponent.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
 namespace zeek {
+
+class RecordVal;
 using RecordValPtr = zeek::IntrusivePtr<RecordVal>;
-}
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, file_analysis);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, file_analysis);
+namespace file_analysis {
 
-namespace zeek::file_analysis {
+class File;
+class Analyzer;
+class Manager;
 
 /**
  * Component description for plugins providing file analyzers.
@@ -81,4 +81,5 @@ private:
 	factory_function factory_func;	// The analyzer's factory callback.
 };
 
-} // namespace zeek::file_analysis
+} // namespace file_analysis
+} // namespace zeek

src/file_analysis/File.h

@@ -13,19 +13,19 @@
 #include "zeek/ZeekArgs.h"
 #include "zeek/WeirdState.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(EventHandlerPtr, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(RecordType, zeek);
 namespace zeek {
+
+class Connection;
+class EventHandlerPtr;
+class RecordVal;
+class RecordType;
 using RecordValPtr = IntrusivePtr<RecordVal>;
 using RecordTypePtr = IntrusivePtr<RecordType>;
-}
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(FileReassembler, zeek, file_analysis);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Tag, zeek, file_analysis);
+namespace file_analysis {
 
-namespace zeek::file_analysis {
+class FileReassembler;
+class Tag;
 
 /**
  * Wrapper class around \c fa_file record values from script layer.
@@ -367,3 +367,4 @@ protected:
 };
 
 } // namespace file_analysis
+} // namespace zeek

src/file_analysis/FileReassembler.cc

@@ -3,10 +3,10 @@
 #include "zeek/file_analysis/FileReassembler.h"
 #include "zeek/file_analysis/File.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
-
 namespace zeek::file_analysis {
 
+class File;
+
 FileReassembler::FileReassembler(File *f, uint64_t starting_offset)
 	: Reassembler(starting_offset, REASSEM_FILE), the_file(f), flushing(false)
 	{

src/file_analysis/FileReassembler.h

@@ -4,12 +4,14 @@
 
 #include "zeek/Reassem.h"
 
-namespace zeek { class File; }
+namespace zeek {
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(Connection, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
+class Connection;
+class File;
 
-namespace zeek::file_analysis {
+namespace file_analysis {
+
+class File;
 
 class FileReassembler final : public Reassembler {
 public:
@@ -57,4 +59,5 @@ protected:
 	bool flushing = false;
 };
 
-} // namespace zeek::file_analysis
+} // namespace file_analysis
+} // namespace zeek

src/file_analysis/Manager.h

@@ -14,16 +14,23 @@
 #include "zeek/analyzer/Tag.h"
 #include "zeek/file_analysis/FileTimer.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(TableVal, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(VectorVal, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Analyzer, zeek, analyzer);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Tag, zeek, analyzer);
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Tag, zeek, file_analysis);
-
 namespace zeek {
+
+class TableVal;
+class VectorVal;
+
+namespace analyzer {
+
+class Analyzer;
+class Tag;
+
+} // namespace analyzer
+
 namespace file_analysis {
 
+class File;
+class Tag;
+
 /**
  * Main entry point for interacting with file analysis.
  */

src/file_analysis/Tag.h

@@ -5,16 +5,18 @@
 #include "zeek/zeek-config.h"
 #include "zeek/Tag.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
-
 namespace zeek::plugin {
 	template <class T> class TaggedComponent;
 	template <class T, class C> class ComponentManager;
 }
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(Component, zeek, file_analysis);
+namespace zeek {
 
-namespace zeek::file_analysis {
+class EnumVal;
+
+namespace file_analysis {
+
+class Component;
 
 /**
  * Class to identify a file analyzer type.
@@ -108,4 +110,5 @@ protected:
 	explicit Tag(EnumValPtr val);
 };
 
-} // namespace zeek::file_analysis
+} // namespace file_analysis
+} // namespace zeek

src/file_analysis/analyzer/x509/OCSP.h

@@ -7,9 +7,11 @@
 
 #include "zeek/file_analysis/analyzer/x509/X509Common.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
+namespace zeek::file_analysis {
 
-namespace zeek::file_analysis::detail {
+class File;
+
+namespace detail {
 
 class OCSP : public file_analysis::detail::X509Common {
 public:
@@ -34,4 +36,5 @@ private:
 	bool request = false; // true if ocsp request, false if reply
 };
 
-} // namespace zeek::file_analysis::detail
+} // namespace detail
+} // namespace zeek::file_analysis

src/file_analysis/analyzer/x509/X509Common.h

@@ -10,18 +10,20 @@
 
 #include "zeek/file_analysis/Analyzer.h"
 
-ZEEK_FORWARD_DECLARE_NAMESPACED(EventHandlerPtr, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Reporter, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(StringVal, zeek);
-ZEEK_FORWARD_DECLARE_NAMESPACED(File, zeek, file_analysis);
-ZEEK_FORWARD_DECLARE_NAMESPACED(Tag, zeek, file_analysis);
-
 namespace zeek {
+
+class EventHandlerPtr;
+class Reporter;
+class StringVal;
 template <class T> class IntrusivePtr;
 using StringValPtr = IntrusivePtr<StringVal>;
-}
 
-namespace zeek::file_analysis::detail {
+namespace file_analysis {
+
+class File;
+class Tag;
+
+namespace detail {
 
 class X509Common : public file_analysis::Analyzer {
 public:
@@ -53,4 +55,6 @@ protected:
 	virtual void ParseExtensionsSpecific(X509_EXTENSION* ex, bool, ASN1_OBJECT*, const char*) = 0;
 };
 
-} // namespace zeek::file_analysis
+} // namespace detail
+} // namespace file_analysis
+} // namespace zeek