Tag the end of some namespaces for consistency

src/Anon.h

@@ -129,4 +129,4 @@ ipaddr32_t anonymize_ip(ipaddr32_t ip, enum ip_addr_anonymization_class_t cl);
 #define LOG_ANONYMIZATION_MAPPING
 void log_anonymization_mapping(ipaddr32_t input, ipaddr32_t output);
 
-}
+} // namespace zeek::detail

src/IntrusivePtr.h

@@ -198,7 +198,7 @@ IntrusivePtr<T> cast_intrusive(IntrusivePtr<U> p) noexcept
 	return {zeek::AdoptRef{}, static_cast<T*>(p.release())};
 	}
 
-}
+} // namespace zeek
 
 // -- comparison to nullptr ----------------------------------------------------
 

src/OpaqueVal.h

@@ -381,7 +381,7 @@ private:
 	std::unique_ptr<paraglob::Paraglob> internal_paraglob;
 };
 
-}
+} // namespace zeek
 
 using OpaqueMgr [[deprecated("Remove in v4.1. Use zeek::OpaqueMgr instead.")]] = zeek::OpaqueMgr;
 using OpaqueVal [[deprecated("Remove in v4.1. Use zeek::OpaqueVal instead.")]] = zeek::OpaqueVal;

src/Stmt.h

@@ -445,7 +445,7 @@ protected:
 	bool is_return;
 };
 
-}
+} // namespace zeek::detail
 
 using Stmt [[deprecated("Remove in v4.1. Use zeek::detail::Stmt instead.")]] = zeek::detail::Stmt;
 using ExprListStmt [[deprecated("Remove in v4.1. Use zeek::detail::ExprListStmt instead.")]] = zeek::detail::ExprListStmt;

src/Val.h

@@ -1434,7 +1434,7 @@ extern bool can_cast_value_to_type(const Val* v, zeek::Type* t);
 // specific instance later.
 extern bool can_cast_value_to_type(const zeek::Type* s, zeek::Type* t);
 
-}
+} // namespace zeek
 
 using Val [[deprecated("Remove in v4.1. Use zeek::Val instead.")]] = zeek::Val;
 using PortVal [[deprecated("Remove in v4.1. Use zeek::PortVal instead.")]] = zeek::PortVal;

src/Var.cc

@@ -17,7 +17,7 @@
 #include "module_util.h"
 #include "ID.h"
 
-using namespace zeek::detail;
+namespace zeek::detail {
 
 static zeek::ValPtr init_val(zeek::detail::Expr* init,
                              const zeek::Type* t,

src/analyzer/protocol/stepping-stone/SteppingStone.h

@@ -81,7 +81,7 @@ protected:
 	int endp_cnt = 0;
 };
 
-} // namespace analyzer::stepping_stone
+} // namespace zeek::analyzer::stepping_stone
 
 namespace analyzer::stepping_stone {
 	using SteppingStoneEndpoint [[deprecated("Remove in v4.1. Use zeek::analyzer::stepping_stone::SteppingStoneEndpoint.")]] = zeek::analyzer::stepping_stone::SteppingStoneEndpoint;

src/analyzer/protocol/tcp/TCP_Flags.h

@@ -46,7 +46,8 @@ inline std::string TCP_Flags::AsString() const
 	*p++ = '\0';
 	return tcp_flags;
 	}
-}
+
+} // namespace zeek::analyzer::tcp
 
 namespace analyzer::tcp {
 	using TCP_Flags [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Flags.")]] = zeek::analyzer::tcp::TCP_Flags;

src/plugin/Component.h

@@ -105,7 +105,7 @@ private:
 	std::string canon_name;
 };
 
-}
+} // namespace zeek::plugin
 
 namespace plugin
 {

src/plugin/ComponentManager.h

@@ -265,10 +265,12 @@ void ComponentManager<T, C>::RegisterComponent(C* component,
 	                       nullptr);
 	}
 
-} // namespace plugin
+} // namespace zeek::plugin
 
 namespace plugin {
-	template <class T, class C>
+
-	using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] =
+template <class T, class C>
-		zeek::plugin::ComponentManager<T, C>;
+using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] =
-}
+	zeek::plugin::ComponentManager<T, C>;
+
+} // namespace plugin

src/plugin/TaggedComponent.h

@@ -70,10 +70,12 @@ T TaggedComponent<T>::Tag() const
 
 template <class T> typename T::type_t TaggedComponent<T>::type_counter(0);
 
-} // namespace plugin
+} // namespace zeek::plugin
 
 namespace plugin {
+
 	template <class T>
 	using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] =
 		zeek::plugin::TaggedComponent<T>;
-}
+
+} // namespace plugin

src/threading/Formatter.h

@@ -162,7 +162,7 @@ private:
 	threading::MsgThread* thread;
 };
 
-} // zeek::threading
+} // namespace zeek::threading
 
 namespace threading::formatter {
 	using Formatter [[deprecated("Remove in v4.1. Use zeek::threading::Formatter.")]] = zeek::threading::Formatter;