From e6d0f8a64db8975e4a697826402a1ac82fc3e0c0 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Fri, 6 Jun 2025 12:26:43 -0700 Subject: [PATCH] Mark ZeekString vector helper methods deprecated --- src/ZeekString.cc | 3 +++ src/ZeekString.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/ZeekString.cc b/src/ZeekString.cc index 4d63345e3f..f013ad97e6 100644 --- a/src/ZeekString.cc +++ b/src/ZeekString.cc @@ -587,7 +587,10 @@ TEST_CASE("searching/modification") { CHECK_EQ(s, *s3); delete s3; +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" char* temp = zeek::String::VecToString(splits); +#pragma GCC diagnostic pop CHECK_EQ(std::string(temp), "[this, is, a, test,]"); free(temp); diff --git a/src/ZeekString.h b/src/ZeekString.h index 8e769f4154..6c2b68449c 100644 --- a/src/ZeekString.h +++ b/src/ZeekString.h @@ -166,8 +166,11 @@ public: Vec* Split(const IdxVec& indices) const; // Helper functions for vectors: + [[deprecated("Remove in v8.1. The ZeekString vector methods are unused.")]] static VectorVal* VecToPolicy(Vec* vec); + [[deprecated("Remove in v8.1. The ZeekString vector methods are unused.")]] static Vec* VecFromPolicy(VectorVal* vec); + [[deprecated("Remove in v8.1. The ZeekString vector methods are unused.")]] static char* VecToString(const Vec* vec); protected: