Move a few low-use classes to namespaces

This commit is contained in:
Tim Wojtulewicz 2020-07-21 16:19:14 -07:00
parent 886fc102b8
commit c9ab1f93e7
53 changed files with 252 additions and 122 deletions

View file

@ -2,6 +2,12 @@
#pragma once
#include "zeek-config.h"
ZEEK_FORWARD_DECLARE_NAMESPACED(TraversalCallback, zeek::detail);
namespace zeek::detail {
enum TraversalCode {
TC_CONTINUE = 0,
TC_ABORTALL = 1,
@ -10,27 +16,32 @@ enum TraversalCode {
#define HANDLE_TC_STMT_PRE(code) \
{ \
if ( (code) == TC_ABORTALL || (code) == TC_ABORTSTMT ) \
if ( (code) == zeek::detail::TC_ABORTALL || (code) == zeek::detail::TC_ABORTSTMT ) \
return (code); \
}
#define HANDLE_TC_STMT_POST(code) \
{ \
if ( (code) == TC_ABORTALL ) \
if ( (code) == zeek::detail::TC_ABORTALL ) \
return (code); \
else if ( (code) == TC_ABORTSTMT ) \
return TC_CONTINUE; \
else if ( (code) == zeek::detail::TC_ABORTSTMT ) \
return zeek::detail::TC_CONTINUE; \
else \
return (code); \
}
#define HANDLE_TC_EXPR_PRE(code) \
{ \
if ( (code) != TC_CONTINUE ) \
if ( (code) != zeek::detail::TC_CONTINUE ) \
return (code); \
}
#define HANDLE_TC_EXPR_POST(code) \
return (code);
class TraversalCallback;
} // namespace zeek::detail
using TraversalCode [[deprecated("Remove in v4.1. Use zeek::detail::TraversalCode.")]] = zeek::detail::TraversalCode;
constexpr auto TC_CONTINUE [[deprecated("Remove in v4.1. Use zeek::detail::TC_CONTINUE.")]] = zeek::detail::TC_CONTINUE;
constexpr auto TC_ABORTALL [[deprecated("Remove in v4.1. Use zeek::detail::TC_ABORTALL.")]] = zeek::detail::TC_ABORTALL;
constexpr auto TC_ABORTSTMT [[deprecated("Remove in v4.1. Use zeek::detail::TC_ABORTSTMT.")]] = zeek::detail::TC_ABORTSTMT;