From c78fa4bcf9014637b80721c9eae2e8a25afe1a23 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 11 Feb 2020 11:08:56 +0100 Subject: [PATCH] Val: eliminate the "RE.h" include --- src/CompHash.cc | 1 + src/Val.h | 3 ++- src/broker/Data.cc | 1 + src/supervisor/Supervisor.cc | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CompHash.cc b/src/CompHash.cc index 4e6cc1af69..37ee7e25c9 100644 --- a/src/CompHash.cc +++ b/src/CompHash.cc @@ -6,6 +6,7 @@ #include "BroString.h" #include "Dict.h" #include "Val.h" +#include "RE.h" #include "Reporter.h" #include "Func.h" diff --git a/src/Val.h b/src/Val.h index 94873a55c0..79172c3f55 100644 --- a/src/Val.h +++ b/src/Val.h @@ -5,7 +5,6 @@ #include "Type.h" #include "Timer.h" #include "Notifier.h" -#include "RE.h" #include "net_util.h" #include @@ -60,6 +59,8 @@ class VectorVal; class TableEntryVal; +class RE_Matcher; + typedef union { // Used for bool, int, enum. bro_int_t int_val; diff --git a/src/broker/Data.cc b/src/broker/Data.cc index a9db857f49..9ab45c7fdb 100644 --- a/src/broker/Data.cc +++ b/src/broker/Data.cc @@ -2,6 +2,7 @@ #include "File.h" #include "Desc.h" #include "IntrusivePtr.h" +#include "RE.h" #include "Scope.h" #include "module_util.h" #include "3rdparty/doctest.h" diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc index 51f2e9f8a4..a1dd2a21d4 100644 --- a/src/supervisor/Supervisor.cc +++ b/src/supervisor/Supervisor.cc @@ -15,6 +15,7 @@ #include "iosource/Manager.h" #include "BroString.h" #include "Dict.h" +#include "RE.h" #include "Reporter.h" #include "Scope.h" #include "DebugLogger.h"