Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move deprecation macro to zeek-config.h.in to avoid having to over-include util.h

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-13 16:53:29 -07:00
parent 9364e6a5b7
commit f6a251cdac
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/util.h
View file

@ -61,11 +61,6 @@ extern HeapLeakChecker* heap_checker;
#include <pthread_np.h> #include <pthread_np.h>
#endif #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.")]] [[deprecated("Remove in v4.1. Use uint64_t instead.")]]
typedef uint64_t uint64; typedef uint64_t uint64;
[[deprecated("Remove in v4.1. Use uint32_t instead.")]] [[deprecated("Remove in v4.1. Use uint32_t instead.")]]

5
zeek-config.h.in
View file

@ -274,3 +274,8 @@ extern const char* BRO_VERSION_FUNCTION();
#define ZEEK_LSAN_DISABLE(x) #define ZEEK_LSAN_DISABLE(x)
#define ZEEK_LSAN_DISABLE_SCOPE(x) #define ZEEK_LSAN_DISABLE_SCOPE(x)
#endif #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;