Fix indentation of namespaced aliases

src/Trigger.h

@@ -152,8 +152,10 @@ extern trigger::Manager* trigger_mgr;
 } // namespace zeek::detail
 
 namespace trigger {
+
 using Trigger [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Trigger.")]] = zeek::detail::trigger::Trigger;
 using Manager [[deprecated("Remove in v4.1. Use zeek::detail::trigger::Manager.")]] = zeek::detail::trigger::Manager;
-}
+
+} // namespace trigger
 
 extern zeek::detail::trigger::Manager*& trigger_mgr [[deprecated("Remove in v4.1. Use zeek::detail::trigger_mgr.")]];

src/analyzer/Analyzer.h

@@ -959,6 +959,7 @@ private:
 } // namespace zeek::analyzer
 
 namespace analyzer {
+
 using Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::Analyzer instead.")]] = zeek::analyzer::Analyzer;
 using AnalyzerTimer [[deprecated("Remove in v4.1. Use zeek::analyzer::AnalyzerTimer instead.")]] = zeek::analyzer::AnalyzerTimer;
 using SupportAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::SupportAnalyzer instead.")]] = zeek::analyzer::SupportAnalyzer;
@@ -967,4 +968,5 @@ namespace analyzer {
 
 using analyzer_list [[deprecated("Remove in v4.1. Use zeek::analyzer::analyzer_list instead.")]] = zeek::analyzer::analyzer_list;
 using ID [[deprecated("Remove in v4.1. Use zeek::analyzer::ID instead.")]] = zeek::analyzer::ID;
-}
+
+} // namespace analyzer

src/analyzer/protocol/arp/ARP.h

@@ -59,6 +59,8 @@ protected:
 
 } // namespace zeek::analyzer::arp
 
-namespace analyer::arp {
+namespace analyzer::arp {
+
 using ARP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::arp::ARP_Analyzer.")]] = zeek::analyzer::arp::ARP_Analyzer;
-}
+
+} // namespace analyzer::arp

src/analyzer/protocol/ayiya/AYIYA.h

@@ -23,5 +23,7 @@ protected:
 } // namespace zeek::analyzer::ayiya
 
 namespace analyzer::ayiya {
+
 using AYIYA_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::ayiya::AYIYA_Analyzer.")]] = zeek::analyzer::ayiya::AYIYA_Analyzer;
-}
+
+} // namespace analyzer::ayiya

src/analyzer/protocol/bittorrent/BitTorrent.h

@@ -35,4 +35,4 @@ namespace analyzer::bittorrent {
 
 using BitTorrent_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::BitTorrent_Analyzer.")]] = zeek::analyzer::bittorrent::BitTorrent_Analyzer;
 
-}
+} // namespace analyzer::bittorrent

src/analyzer/protocol/bittorrent/BitTorrentTracker.h

@@ -163,4 +163,4 @@ namespace analyzer::bittorrent {
 
 using BitTorrentTracker_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::bittorrent::BitTorrentTracker_Analyzer.")]] = zeek::analyzer::bittorrent::BitTorrentTracker_Analyzer;
 
-	}
+} // namespace analyzer::bittorrent

src/analyzer/protocol/conn-size/ConnSize.h

@@ -53,5 +53,7 @@ protected:
 } // namespace zeek::analyzer::conn_size
 
 namespace analyzer::conn_size {
+
 using ConnSize_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::conn_size::ConnSize_Analyzer.")]] = zeek::analyzer::conn_size::ConnSize_Analyzer;
-}
+
+} // namespace analyzer::conn_size

src/analyzer/protocol/dce-rpc/DCE_RPC.h

@@ -35,5 +35,7 @@ protected:
 } // namespace zeek::analyzer::dce_rpc
 
 namespace analyzer::dce_rpc {
+
 using DCE_RPC_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dce_rpc::DCE_RPC_Analyzer.")]] = zeek::analyzer::dce_rpc::DCE_RPC_Analyzer;
-}
+
+} // namespace analyzer::dce_rpc

src/analyzer/protocol/dhcp/DHCP.h

@@ -25,5 +25,7 @@ protected:
 } // namespace zeek::analyzer::dhcp
 
 namespace analyzer::dhcp {
+
 using DHCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dhcp::DHCP_Analyzer.")]] = zeek::analyzer::dhcp::DHCP_Analyzer;
-}
+
+} // namespace analyzer::dhcp

src/analyzer/protocol/dnp3/DNP3.h

@@ -95,8 +95,9 @@ public:
 } // namespace zeek::analyzer::dnp3
 
 namespace analyzer::dnp3 {
+
 using DNP3_Base [[deprecated("Remove in v4.1. Use zeek::analyzer::dnp3::detail::DNP3_Base.")]] = zeek::analyzer::dnp3::detail::DNP3_Base;
 using DNP3_TCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dnp3::DNP3_TCP_Analyzer.")]] = zeek::analyzer::dnp3::DNP3_TCP_Analyzer;
 using DNP3_UDP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::dnp3::DNP3_UDP_Analyzer.")]] = zeek::analyzer::dnp3::DNP3_UDP_Analyzer;
 
-}
+} // namespace analyzer::dnp3

src/analyzer/protocol/dns/DNS.h

@@ -420,6 +420,7 @@ protected:
 } // namespace zeek::analyzer::dns
 
 namespace analyzer::dns {
+
 using DNS_Opcode [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_Opcode.")]] = zeek::analyzer::dns::detail::DNS_Opcode;
 constexpr auto DNS_OP_QUERY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_OP_QUERY.")]] = zeek::analyzer::dns::detail::DNS_OP_QUERY;
 constexpr auto DNS_OP_IQUERY [[deprecated("Remove in v4.1. Use zeek::analyzer::dns::detail::DNS_OP_IQUERY.")]] = zeek::analyzer::dns::detail::DNS_OP_IQUERY;

src/analyzer/protocol/pia/PIA.h

@@ -175,7 +175,9 @@ private:
 } // namespace zeek::analyzer::pia
 
 namespace analzyer::pia {
+
 using PIA [[deprecated("Remove in v4.1. Use zeek::analyzer::pia::PIA.")]] = zeek::analyzer::pia::PIA;
 using PIA_TCP [[deprecated("Remove in v4.1. Use zeek::analyzer::pia::PIA_TCP.")]] = zeek::analyzer::pia::PIA_TCP;
 using PIA_UDP [[deprecated("Remove in v4.1. Use zeek::analyzer::pia::PIA_UDP.")]] = zeek::analyzer::pia::PIA_UDP;
-}
+
+} // namespace analyzer::pia

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

@@ -84,7 +84,9 @@ protected:
 } // 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;
 using SteppingStone_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::stepping_stone::SteppingStone_Analyzer.")]] = zeek::analyzer::stepping_stone::SteppingStone_Analyzer;
 using SteppingStoneManager [[deprecated("Remove in v4.1. Use zeek::analyzer::stepping_stone::SteppingStoneManager.")]] = zeek::analyzer::stepping_stone::SteppingStoneManager;
+
 } // namespace analyzer::stepping_stone

src/analyzer/protocol/tcp/ContentLine.h

@@ -117,5 +117,7 @@ protected:
 } // namespace zeek::analyzer::tcp
 
 namespace analyzer::tcp {
+
 using ContentLine_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::ContentLine_Analyzer.")]] = zeek::analyzer::tcp::ContentLine_Analyzer;
-}
+
+} // namespace analyzer::tcp

src/analyzer/protocol/tcp/Stats.h

@@ -68,5 +68,7 @@ private:
 } // namespace zeek::analyzer::tcp
 
 namespace analyzer::tcp {
+
 using TCPStateStats [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCPStateStats.")]] = zeek::analyzer::tcp::TCPStateStats;
-}
+
+} // namespace analyzer::tcp

src/analyzer/protocol/tcp/TCP.h

@@ -305,9 +305,11 @@ protected:
 } // namespace zeek::analyzer::tcp
 
 namespace analyzer::tcp {
+
 using TCP_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Analyzer.")]] = zeek::analyzer::tcp::TCP_Analyzer;
 using TCP_ApplicationAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_ApplicationAnalyzer.")]] = zeek::analyzer::tcp::TCP_ApplicationAnalyzer;
 using TCP_SupportAnalyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_SupportAnalyzer.")]] = zeek::analyzer::tcp::TCP_SupportAnalyzer;
 using TCPStats_Endpoint [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCPStats_Endpoint.")]] = zeek::analyzer::tcp::TCPStats_Endpoint;
 using TCPStats_Analyzer [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCPStats_Analyzer.")]] = zeek::analyzer::tcp::TCPStats_Analyzer;
-}
+
+} // namespace analyzer::tcp

src/analyzer/protocol/tcp/TCP_Flags.h

@@ -50,5 +50,7 @@ inline std::string TCP_Flags::AsString() const
 } // 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;
-}
+
+} // namespace analyzer::tcp

src/analyzer/protocol/tcp/TCP_Reassembler.h

@@ -116,5 +116,7 @@ private:
 } // namespace zeek::analyzer::tcp
 
 namespace analyzer::tcp {
+
 using TCP_Reassembler [[deprecated("Remove in v4.1. Use zeek::analyzer::tcp::TCP_Reassembler.")]] = zeek::analyzer::tcp::TCP_Reassembler;
-}
+
+} // namespace analyzer::tcp

src/broker/Data.h

@@ -310,6 +310,7 @@ protected:
 } // namespace zeek::Broker
 
 namespace bro_broker {
+
 extern zeek::OpaqueTypePtr& opaque_of_data_type;
 extern zeek::OpaqueTypePtr& opaque_of_set_iterator;
 extern zeek::OpaqueTypePtr& opaque_of_table_iterator;

src/broker/Manager.h

@@ -447,6 +447,8 @@ extern Broker::Manager* broker_mgr;
 extern zeek::Broker::Manager*& broker_mgr [[deprecated("Remove in v4.1. Use zeek::broker_mgr.")]];
 
 namespace bro_broker {
+
 using Stats [[deprecated("Remove in v4.1. Use zeek::Broker::Stats.")]] = zeek::Broker::Stats;
 using Manager [[deprecated("Remove in v4.1. Use zeek::Broker::Manager.")]] = zeek::Broker::Manager;
+
 } // namespace bro_broker

src/file_analysis/AnalyzerSet.h

@@ -215,5 +215,7 @@ private:
 } // namespace zeek::file_analysis::detail
 
 namespace file_analysis {
+
 using AnalyzerSet [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::AnalyzerSet.")]] = zeek::file_analysis::detail::AnalyzerSet;
+
 } // namespace file_analysis

src/file_analysis/Component.h

@@ -92,5 +92,7 @@ private:
 } // namespace zeek::file_analysis
 
 namespace file_analysis {
+
 using Component [[deprecated("Remove in v4.1. Use zeek::file_analysis::Component.")]] = zeek::file_analysis::Component;
+
 } // namespace file_analysis

src/file_analysis/File.h

@@ -398,5 +398,7 @@ protected:
 } // namespace file_analysis
 
 namespace file_analysis {
+
 using File [[deprecated("Remove in v4.1. Use zeek::file_analysis::File.")]] = zeek::file_analysis::File;
+
 } // namespace zeek::file_analysis

src/file_analysis/FileReassembler.h

@@ -62,5 +62,7 @@ protected:
 } // namespace zeek::file_analysis
 
 namespace file_analysis {
+
 using FileReassembler [[deprecated("Remove in v4.1. Use zeek::file_analysis::FileReassembler.")]] = zeek::file_analysis::FileReassembler;
+
 } // namespace file_analysis

src/file_analysis/FileTimer.h

@@ -36,5 +36,7 @@ private:
 } // namespace zeek::file_analysis::detail
 
 namespace file_analysis {
+
 using FileTimer [[deprecated("Remove in v4.1. Use zeek::file_analysis::detail::FileTimer.")]] = zeek::file_analysis::detail::FileTimer;
+
 } // namespace file_analysis

src/file_analysis/Manager.h

@@ -445,7 +445,9 @@ extern file_analysis::Manager* file_mgr;
 } // namespace zeek
 
 namespace file_analysis {
+
 using Manager [[deprecated("Remove in v4.1. Use zeek::file_analysis::Manager.")]] = zeek::file_analysis::Manager;
-}
+
+} // namespace file_analysis
 
 extern zeek::file_analysis::Manager*& file_mgr [[deprecated("Remove in v4.1. Use zeek::file_mgr.")]];

src/file_analysis/Tag.h

@@ -125,5 +125,7 @@ protected:
 } // namespace zeek::file_analysis
 
 namespace file_analysis {
+
 using Tag [[deprecated("Remove in v4.1. Use zeek::file_analysis::Tag.")]] = zeek::file_analysis::Tag;
+
 } // namespace file_analysis

src/input/Component.h

@@ -63,5 +63,7 @@ private:
 } // namespace zeek::input
 
 namespace input {
+
 using Component [[deprecated("Remove in v4.1. Use zeek::input::Component.")]] = zeek::input::Component;
-}
+
+} // namespace input

src/input/Manager.h

@@ -265,5 +265,7 @@ extern input::Manager* input_mgr;
 extern zeek::input::Manager*& input_mgr [[deprecated("Remove in v4.1. Use zeek::input_mgr.")]];
 
 namespace input {
+
 using Manager [[deprecated("Remove in v4.1. Use zeek::input::Manager.")]] = zeek::input::Manager;
-}
+
+} // namespace input

src/input/ReaderFrontend.h

@@ -133,5 +133,7 @@ private:
 } // namespace zeek::input
 
 namespace input {
+
 using ReaderFrontend [[deprecated("Remove in v4.1. Use zeek::input::ReaderFrontend.")]] = zeek::input::ReaderFrontend;
-}
+
+} // namespace input

src/input/Tag.h

@@ -126,5 +126,7 @@ protected:
 } // namespace zeek::input
 
 namespace input {
+
 using Tag [[deprecated("Remove in v4.1. Use zeek::input::Tag.")]] = zeek::input::Tag;
-}
+
+} // namespace input

src/input/readers/ascii/Ascii.h

@@ -88,6 +88,8 @@ private:
 } // namespace zeek::input::reader::detail
 
 namespace input::reader {
+
 using FieldMapping [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::FieldMapping.")]] = zeek::input::reader::detail::FieldMapping;
 using Ascii [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Ascii.")]] = zeek::input::reader::detail::Ascii;
+
 } // namespace input::reader

src/input/readers/benchmark/Benchmark.h

@@ -45,5 +45,7 @@ private:
 } // namespace zeek::input::reader
 
 namespace input::reader {
+
 using Benchmark [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Benchmark.")]] = zeek::input::reader::detail::Benchmark;
-}
+
+} // namespace input::reader

src/input/readers/binary/Binary.h

@@ -47,5 +47,7 @@ private:
 } // namespace zeek::input::reader::detail
 
 namespace input::reader {
+
 using Binary [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Binary.")]] = zeek::input::reader::detail::Binary;
-}
+
+} // namespace input::reader

src/input/readers/config/Config.h

@@ -57,5 +57,7 @@ private:
 } // namespace zeek::input::reader::detail
 
 namespace input::reader {
+
 using Config [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Config.")]] = zeek::input::reader::detail::Config;
-}
+
+} // namespace input::reader

src/input/readers/raw/Raw.h

@@ -92,5 +92,7 @@ private:
 } // namespace zeek::input::reader::detail
 
 namespace input::reader {
+
 using Raw [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::Raw.")]] = zeek::input::reader::detail::Raw;
-}
+
+} // namespace input::reader

src/input/readers/sqlite/SQLite.h

@@ -48,5 +48,7 @@ private:
 } // namespace zeek::input::reader
 
 namespace input::reader {
+
 using SQLite [[deprecated("Remove in v4.1. Use zeek::input::reader::detail::SQLite.")]] = zeek::input::reader::detail::SQLite;
-}
+
+} // namespace input::reader

src/iosource/IOSource.h

@@ -89,5 +89,7 @@ private:
 } // namespace zeek::iosource
 
 namespace iosource {
+
 using IOSource [[deprecated("Remove in v4.1. Use zeek::iosource::IOSource.")]] = zeek::iosource::IOSource;
-}
+
+} // namespace iosource

src/iosource/Manager.h

@@ -219,5 +219,7 @@ extern iosource::Manager* iosource_mgr;
 extern zeek::iosource::Manager*& iosource_mgr [[deprecated("Remove in v4.1. Use zeek::iosource_mgr.")]];
 
 namespace iosource {
+
 using Manager [[deprecated("Remove in v4.1. Use zeek::iosource::Manager.")]] = zeek::iosource::Manager;
-}
+
+} // namespace iosource

src/iosource/PktDumper.h

@@ -142,5 +142,7 @@ private:
 } // namespace zeek::iosource
 
 namespace iosource {
+
 using PktDumper [[deprecated("Remove in v4.1. Use zeek::iosource::PktDumper.")]] = zeek::iosource::PktDumper;
-}
+
+} // namespace iosource

src/iosource/PktSrc.h

@@ -383,5 +383,7 @@ private:
 } // namespace zeek::iosource
 
 namespace iosource {
+
 using PktSrc [[deprecated("Remove in v4.1. Use zeek::iosource::PktSrc.")]] = zeek::iosource::PktSrc;
-}
+
+} // namespace iosource

src/iosource/pcap/Dumper.h

@@ -34,5 +34,7 @@ private:
 } // namespace zeek::iosource::pcap
 
 namespace iosource::pcap {
+
 using PcapDumper [[deprecated("Remove in v4.1. Use zeek::iosource::pcap::PcapDumper.")]] = zeek::iosource::pcap::PcapDumper;
-}
+
+} // namespace iosource::pcap

src/iosource/pcap/Source.h

@@ -43,5 +43,7 @@ private:
 } // namespace zeek::iosource::pcap
 
 namespace iosource::pcap {
+
 using PcapSource [[deprecated("Remove in v4.1. Use zeek::iosource::pcap::PcapSource.")]] = zeek::iosource::pcap::PcapSource;
-}
+
+} // namespace iosource::pcap

src/logging/Manager.h

@@ -309,5 +309,7 @@ extern logging::Manager* log_mgr;
 extern zeek::logging::Manager*& log_mgr [[deprecated("Remove in v4.1. Use zeek::log_mgr.")]];
 
 namespace logging {
+
 using Manager [[deprecated("Remove in v4.1. Use zeek::logging::Manager.")]] = zeek::logging::Manager;
-}
+
+} // namespace logging

src/logging/Tag.h

@@ -131,5 +131,7 @@ protected:
 } // namespace zeek::logging
 
 namespace logging {
+
 using Tag [[deprecated("Remove in v4.1. Use zeek::logging::Tag.")]] = zeek::logging::Tag;
-}
+
+} // namespace logging

src/logging/WriterBackend.h

@@ -402,5 +402,7 @@ private:
 } // namespace zeek::logging
 
 namespace logging {
+
 using WriterBackend [[deprecated("Remove in v4.1. Use zeek::logging::WriterBackend.")]] = zeek::logging::WriterBackend;
-}
+
+} // namespace logging

src/logging/WriterFrontend.h

@@ -212,5 +212,7 @@ protected:
 } // namespace zeek::logging
 
 namespace logging {
+
 using WriterFrontend [[deprecated("Remove in v4.1. Use zeek::logging::WriterFrontend.")]] = zeek::logging::WriterFrontend;
-}
+
+} // namespace logging

src/plugin/Manager.h

@@ -502,8 +502,10 @@ extern zeek::plugin::Manager* plugin_mgr;
 } // namespace zeek
 
 namespace plugin {
+
 using Manager [[deprecated("Remove in v4.1. Use zeek::plugin::Manager.")]] = zeek::plugin::Manager;
-}
+
+} // namespace plugin
 
 /**
  * The global plugin manager singleton.

src/probabilistic/BitVector.h

@@ -359,5 +359,7 @@ private:
 } // namespace zeek::probabilistic::detail
 
 namespace probabilistic {
+
 using BitVector [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::BitVector.")]] = zeek::probabilistic::detail::BitVector;
-}
+
+} // namespace probabilistic

src/probabilistic/CardinalityCounter.h

@@ -189,5 +189,7 @@ private:
 } // namespace zeek::probabilistic::detail
 
 namespace probabilistic {
+
 using CardinalityCounter [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::CardinalityCounter.")]] = zeek::probabilistic::detail::CardinalityCounter;
-}
+
+} // namespace probabilistic

src/probabilistic/CounterVector.h

@@ -159,5 +159,7 @@ private:
 } // namespace zeek::probabilistic::detail
 
 namespace probabilistic {
+
 using CounterVector [[deprecated("Remove in v4.1. Use zeek::probabilisitc::detail::CounterVector.")]] = zeek::probabilistic::detail::CounterVector;
-}
+
+} // namespace probabilistic

src/probabilistic/Hasher.h

@@ -270,4 +270,4 @@ namespace probabilistic {
 using DefaultHasher [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::DefaultHasher.")]] = zeek::probabilistic::detail::DefaultHasher;
 using DoubleHasher [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::DoubleHasher.")]] = zeek::probabilistic::detail::DoubleHasher;
 
-}
+} // namespace probabilistic

src/probabilistic/Topk.h

@@ -175,7 +175,9 @@ private:
 } // namespace zeek::probabilistic::detail
 
 namespace probabilistic {
+
 using Element [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Element.")]] = zeek::probabilistic::detail::Element;
 using Bucket [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::Bucket.")]] = zeek::probabilistic::detail::Bucket;
 using TopkVal [[deprecated("Remove in v4.1. Use zeek::probabilistic::detail::TopkVal.")]] = zeek::probabilistic::detail::TopkVal;
-}
+
+} //namespace probabilistic

src/threading/BasicThread.h

@@ -216,5 +216,7 @@ private:
 } // namespace zeek::threading
 
 namespace threading {
+
 using BasicThread [[deprecated("Remove in v4.1. Use zeek::threading::BasicThread.")]] = zeek::threading::BasicThread;
-}
+
+} // namespace threading

src/threading/Formatter.h

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

src/threading/Manager.h

@@ -167,9 +167,13 @@ extern threading::Manager* thread_mgr;
 
 extern zeek::threading::Manager*& thread_mgr [[deprecated("Remove in v4.1. Use zeek::thread_mgr.")]];
 
-namespace threading::detail {
-	using HeartbeatTimer [[deprecated("Remove in v4.1. Use zeek::threading::detail::HeartbeatTimer.")]] = zeek::threading::detail::HeartbeatTimer;
-}
 namespace threading {
+
 using Manager [[deprecated("Remove in v4.1. Use zeek::threading::Manager.")]] = zeek::threading::Manager;
-}
+
+namespace detail {
+
+using HeartbeatTimer [[deprecated("Remove in v4.1. Use zeek::threading::detail::HeartbeatTimer.")]] = zeek::threading::detail::HeartbeatTimer;
+
+} // namespace detail
+} // namespace threading

src/threading/MsgThread.h

@@ -483,10 +483,12 @@ private:
 } // namespace zeek::threading
 
 namespace threading {
+
 using MsgThread [[deprecated("Remove in v4.1. Use zeek::threading::MsgThread.")]] = zeek::threading::MsgThread;
 using Message [[deprecated("Remove in v4.1. Use zeek::threading::Message.")]] = zeek::threading::Message;
 using BasicInputMessage [[deprecated("Remove in v4.1. Use zeek::threading::BasicInputMessage.")]] = zeek::threading::BasicInputMessage;
 using BasicOutputMessage [[deprecated("Remove in v4.1. Use zeek::threading::BasicOutputMessage.")]] = zeek::threading::BasicOutputMessage;
 template<typename O> using InputMessage [[deprecated("Remove in v4.1. Use zeek::threading::InputMessage.")]] = zeek::threading::InputMessage<O>;
 template<typename O> using OutputMessage [[deprecated("Remove in v4.1. Use zeek::threading::OutputMessage.")]] = zeek::threading::OutputMessage<O>;
+
 } // namespace threading

src/threading/Queue.h

@@ -264,5 +264,7 @@ inline void Queue<T>::WakeUp()
 } // namespace zeek::threading
 
 namespace threading {
+
 template<typename T> using Queue [[deprecated("Remove in v4.1. Use zeek::threading::Queue.")]] = zeek::threading::Queue<T>;
-}
+
+} // namespace threading

src/threading/SerialTypes.h

@@ -217,6 +217,8 @@ private:
 } // namespace zeek::threading
 
 namespace threading {
+
 using Field [[deprecated("Remove in v4.1. Use zeek::threading::Field.")]] = zeek::threading::Field;
 using Value [[deprecated("Remove in v4.1. Use zeek::threading::Value.")]] = zeek::threading::Value;
-}
+
+} // namespace threading

src/threading/formatters/Ascii.h

@@ -62,5 +62,7 @@ private:
 } // namespace zeek::threading::formatter
 
 namespace threading::formatter {
+
 using Ascii [[deprecated("Remove in v4.1. Use zeek::threading::formatter::Ascii.")]] = zeek::threading::formatter::Ascii;
-}
+
+} // namespace threading::formatter

src/threading/formatters/JSON.h

@@ -47,5 +47,7 @@ private:
 } // namespace zeek::threading::formatter
 
 namespace threading::formatter {
+
 using JSON [[deprecated("Remove in v4.1. Use zeek::threading::formatter::JSON.")]] = zeek::threading::formatter::JSON;
-}
+
+} // namespace threading::formatter

src/util.h

@@ -771,6 +771,7 @@ constexpr auto zeekenv [[deprecated("Remove in v4.1. Use zeek::util::zeekenv.")]
 constexpr auto json_escape_utf8 [[deprecated("Remove in v4.1. Use zeek::util::json_escape_utf8.")]] = zeek::util::json_escape_utf8;
 
 namespace zeek {
+
 [[deprecated("Remove in v4.1. Use zeek::util::set_thread_name.")]]
 void set_thread_name(const char* name, pthread_t tid = pthread_self());
 
@@ -778,4 +779,5 @@ namespace zeek {
 constexpr auto random_number [[deprecated("Remove in v4.1. Use zeek::util::detail::random_number.")]] = zeek::util::detail::random_number;
 constexpr auto max_random [[deprecated("Remove in v4.1. Use zeek::util::detail::max_random.")]] = zeek::util::detail::max_random;
 constexpr auto seed_random [[deprecated("Remove in v4.1. Use zeek::util::detail::seed_random.")]] = zeek::util::detail::seed_random;
-}
+
+} // namespace zeek