From 23bbe0ac38ec3e6fe94c0c2f6baa45e45c3428e1 Mon Sep 17 00:00:00 2001
From: Tim Wojtulewicz <tim@corelight.com>
Date: Thu, 24 Sep 2020 09:56:55 -0700
Subject: [PATCH] Move packet_mgr to the zeek namespace

---
 src/packet_analysis/Manager.h | 7 +++++--
 src/zeek-setup.cc             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/packet_analysis/Manager.h b/src/packet_analysis/Manager.h
index 7030c8fc05..059d8537ea 100644
--- a/src/packet_analysis/Manager.h
+++ b/src/packet_analysis/Manager.h
@@ -8,7 +8,8 @@
 #include "iosource/Packet.h"
 #include "Dispatcher.h"
 
-namespace zeek::packet_analysis {
+namespace zeek {
+namespace packet_analysis {
 
 class Analyzer;
 using AnalyzerPtr = std::shared_ptr<Analyzer>;
@@ -93,6 +94,8 @@ private:
 	AnalyzerPtr root_analyzer = nullptr;
 };
 
-}
+} // namespace packet_analysis
 
 extern zeek::packet_analysis::Manager* packet_mgr;
+
+} // namespace zeek
diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index c748e02d84..600597988d 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -93,7 +93,7 @@ zeek::ValManager* zeek::val_mgr = nullptr;
 zeek::ValManager*& val_mgr = zeek::val_mgr;
 zeek::analyzer::Manager* zeek::analyzer_mgr = nullptr;
 zeek::analyzer::Manager*& analyzer_mgr = zeek::analyzer_mgr;
-zeek::packet_analysis::Manager* packet_mgr = nullptr;
+zeek::packet_analysis::Manager* zeek::packet_mgr = nullptr;
 zeek::plugin::Manager* zeek::plugin_mgr = nullptr;
 zeek::plugin::Manager*& plugin_mgr = zeek::plugin_mgr;