From 812ac5536d822265f41b66b00dac8dd4bd9d9ca3 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 7 Aug 2020 08:19:20 -0700 Subject: [PATCH] Tag the end of some namespaces for consistency --- src/Anon.h | 2 +- src/IntrusivePtr.h | 2 +- src/OpaqueVal.h | 2 +- src/Stmt.h | 2 +- src/Val.h | 2 +- src/Var.cc | 2 +- src/analyzer/protocol/stepping-stone/SteppingStone.h | 2 +- src/analyzer/protocol/tcp/TCP_Flags.h | 3 ++- src/plugin/Component.h | 2 +- src/plugin/ComponentManager.h | 12 +++++++----- src/plugin/TaggedComponent.h | 6 ++++-- src/threading/Formatter.h | 2 +- 12 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/Anon.h b/src/Anon.h index c9b1db8553..ce82bd2b38 100644 --- a/src/Anon.h +++ b/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 diff --git a/src/IntrusivePtr.h b/src/IntrusivePtr.h index b98761a326..d49aebfb59 100644 --- a/src/IntrusivePtr.h +++ b/src/IntrusivePtr.h @@ -198,7 +198,7 @@ IntrusivePtr cast_intrusive(IntrusivePtr p) noexcept return {zeek::AdoptRef{}, static_cast(p.release())}; } -} +} // namespace zeek // -- comparison to nullptr ---------------------------------------------------- diff --git a/src/OpaqueVal.h b/src/OpaqueVal.h index 8b8dcf1cac..399c9fa4a4 100644 --- a/src/OpaqueVal.h +++ b/src/OpaqueVal.h @@ -381,7 +381,7 @@ private: std::unique_ptr 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; diff --git a/src/Stmt.h b/src/Stmt.h index e34dcce21e..20a536dbf8 100644 --- a/src/Stmt.h +++ b/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; diff --git a/src/Val.h b/src/Val.h index 65b898768c..9a77225d53 100644 --- a/src/Val.h +++ b/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; diff --git a/src/Var.cc b/src/Var.cc index 8c4395b5ea..edfa10d773 100644 --- a/src/Var.cc +++ b/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, diff --git a/src/analyzer/protocol/stepping-stone/SteppingStone.h b/src/analyzer/protocol/stepping-stone/SteppingStone.h index 2665b100dd..04397d2da8 100644 --- a/src/analyzer/protocol/stepping-stone/SteppingStone.h +++ b/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; diff --git a/src/analyzer/protocol/tcp/TCP_Flags.h b/src/analyzer/protocol/tcp/TCP_Flags.h index 48030628f0..942f5ed589 100644 --- a/src/analyzer/protocol/tcp/TCP_Flags.h +++ b/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; diff --git a/src/plugin/Component.h b/src/plugin/Component.h index 695be4bbda..538730f7b1 100644 --- a/src/plugin/Component.h +++ b/src/plugin/Component.h @@ -105,7 +105,7 @@ private: std::string canon_name; }; -} +} // namespace zeek::plugin namespace plugin { diff --git a/src/plugin/ComponentManager.h b/src/plugin/ComponentManager.h index ddb8ad34b6..19b563a6c2 100644 --- a/src/plugin/ComponentManager.h +++ b/src/plugin/ComponentManager.h @@ -265,10 +265,12 @@ void ComponentManager::RegisterComponent(C* component, nullptr); } -} // namespace plugin +} // namespace zeek::plugin namespace plugin { - template - using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = - zeek::plugin::ComponentManager; -} + +template +using ComponentManager [[deprecated("Remove in v4.1. Use zeek::plugin::ComponentManager instead.")]] = + zeek::plugin::ComponentManager; + +} // namespace plugin diff --git a/src/plugin/TaggedComponent.h b/src/plugin/TaggedComponent.h index 1fcb8fccc0..af44a6a309 100644 --- a/src/plugin/TaggedComponent.h +++ b/src/plugin/TaggedComponent.h @@ -70,10 +70,12 @@ T TaggedComponent::Tag() const template typename T::type_t TaggedComponent::type_counter(0); -} // namespace plugin +} // namespace zeek::plugin namespace plugin { + template using TaggedComponent [[deprecated("Remove in v4.1. Use zeek::plugin::TaggedComponent instead.")]] = zeek::plugin::TaggedComponent; -} + +} // namespace plugin diff --git a/src/threading/Formatter.h b/src/threading/Formatter.h index a1ba38ceaf..230c45c65d 100644 --- a/src/threading/Formatter.h +++ b/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;