diff --git a/CHANGES b/CHANGES index 4cad1bcdf3..97a2d067fb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +8.0.0-dev.646 | 2025-07-13 19:22:52 -0700 + + * Move util::Deferred into util-types.h (Tim Wojtulewicz, Corelight) + 8.0.0-dev.643 | 2025-07-11 15:35:33 -0400 * Cleanup unused baselines (Evan Typanski, Corelight) diff --git a/VERSION b/VERSION index e5fef6e930..9a3ad845a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.0-dev.643 +8.0.0-dev.646 diff --git a/src/util-types.h b/src/util-types.h index da66c2fb3c..11f61b07b8 100644 --- a/src/util-types.h +++ b/src/util-types.h @@ -62,5 +62,17 @@ private: void DoFunc(const std::string& path, bool error_aborts = true); }; +/** + * Helper class that runs a function at destruction. + */ +class Deferred { +public: + Deferred(std::function deferred) : deferred(std::move(deferred)) {} + ~Deferred() { deferred(); } + +private: + std::function deferred; +}; + } // namespace util } // namespace zeek diff --git a/src/util.h b/src/util.h index 429fd11120..5f8bd0fc24 100644 --- a/src/util.h +++ b/src/util.h @@ -622,17 +622,5 @@ inline std::vector split(const wchar_t* s, const wchar_t* del return split(std::wstring_view(s), std::wstring_view(delim)); } -/** - * Helper class that runs a function at destruction. - */ -class Deferred { -public: - Deferred(std::function deferred) : deferred(std::move(deferred)) {} - ~Deferred() { deferred(); } - -private: - std::function deferred; -}; - } // namespace util } // namespace zeek