From f6a251cdac09a73af90383d41b1a7129d4e4397d Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Sat, 13 Jun 2020 16:53:29 -0700 Subject: [PATCH] Move deprecation macro to zeek-config.h.in to avoid having to over-include util.h --- src/util.h | 5 ----- zeek-config.h.in | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util.h b/src/util.h index 045db03b5d..1b94bc2fc5 100644 --- a/src/util.h +++ b/src/util.h @@ -61,11 +61,6 @@ extern HeapLeakChecker* heap_checker; #include #endif -// Note: macro for internal use only during deprecation/namespacing process. -#define ZEEK_FORWARD_DECLARE_NAMESPACED(cls, ns) \ - namespace ns { class cls; } \ - using cls [[deprecated("Remove in v4.1. Use " #ns "::" #cls " instead.")]] = ns::cls; - [[deprecated("Remove in v4.1. Use uint64_t instead.")]] typedef uint64_t uint64; [[deprecated("Remove in v4.1. Use uint32_t instead.")]] diff --git a/zeek-config.h.in b/zeek-config.h.in index 5f5497f8a5..46971ac5a4 100644 --- a/zeek-config.h.in +++ b/zeek-config.h.in @@ -274,3 +274,8 @@ extern const char* BRO_VERSION_FUNCTION(); #define ZEEK_LSAN_DISABLE(x) #define ZEEK_LSAN_DISABLE_SCOPE(x) #endif + +// Note: macro for internal use only during deprecation/namespacing process. +#define ZEEK_FORWARD_DECLARE_NAMESPACED(cls, ns) \ + namespace ns { class cls; } \ + using cls [[deprecated("Remove in v4.1. Use " #ns "::" #cls " instead.")]] = ns::cls;