From e2953c56a918f616422a23d818e660b9c18fc021 Mon Sep 17 00:00:00 2001 From: wconner Date: Thu, 7 Mar 2024 06:58:54 -0800 Subject: Remove usage of absl::NoDestructor. PiperOrigin-RevId: 613570473 --- cc/aead/BUILD.bazel | 1 - cc/aead/CMakeLists.txt | 1 - cc/aead/aes_ctr_hmac_aead_proto_serialization.cc | 17 ++++++++--------- cc/signature/BUILD.bazel | 1 - cc/signature/CMakeLists.txt | 1 - cc/signature/ecdsa_proto_serialization.cc | 23 +++++++++++------------ 6 files changed, 19 insertions(+), 25 deletions(-) (limited to 'cc') diff --git a/cc/aead/BUILD.bazel b/cc/aead/BUILD.bazel index e9992aa83..591783e72 100644 --- a/cc/aead/BUILD.bazel +++ b/cc/aead/BUILD.bazel @@ -793,7 +793,6 @@ cc_library( "//util:status", "//util:statusor", "@com_google_absl//absl/base:core_headers", - "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:string_view", diff --git a/cc/aead/CMakeLists.txt b/cc/aead/CMakeLists.txt index e8dbf0277..31bd0565a 100644 --- a/cc/aead/CMakeLists.txt +++ b/cc/aead/CMakeLists.txt @@ -730,7 +730,6 @@ tink_cc_library( tink::aead::aes_ctr_hmac_aead_key tink::aead::aes_ctr_hmac_aead_parameters absl::core_headers - absl::no_destructor absl::status absl::strings absl::string_view diff --git a/cc/aead/aes_ctr_hmac_aead_proto_serialization.cc b/cc/aead/aes_ctr_hmac_aead_proto_serialization.cc index 08af1e610..981ede6b1 100644 --- a/cc/aead/aes_ctr_hmac_aead_proto_serialization.cc +++ b/cc/aead/aes_ctr_hmac_aead_proto_serialization.cc @@ -17,7 +17,6 @@ #include "tink/aead/aes_ctr_hmac_aead_proto_serialization.h" #include "absl/base/attributes.h" -#include "absl/base/no_destructor.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -357,27 +356,27 @@ util::StatusOr SerializeKey( } AesCtrHmacAeadProtoParametersParserImpl& AesCtrHmacAeadProtoParametersParser() { - static absl::NoDestructor parser( - kTypeUrl, ParseParameters); + static auto* parser = + new AesCtrHmacAeadProtoParametersParserImpl(kTypeUrl, ParseParameters); return *parser; } AesCtrHmacAeadProtoParametersSerializerImpl& AesCtrHmacAeadProtoParametersSerializer() { - static absl::NoDestructor - serializer(kTypeUrl, SerializeParameters); + static auto* serializer = new AesCtrHmacAeadProtoParametersSerializerImpl( + kTypeUrl, SerializeParameters); return *serializer; } AesCtrHmacAeadProtoKeyParserImpl& AesCtrHmacAeadProtoKeyParser() { - static absl::NoDestructor parser(kTypeUrl, - ParseKey); + static auto* parser = + new AesCtrHmacAeadProtoKeyParserImpl(kTypeUrl, ParseKey); return *parser; } AesCtrHmacAeadProtoKeySerializerImpl& AesCtrHmacAeadProtoKeySerializer() { - static absl::NoDestructor serializer( - SerializeKey); + static auto* serializer = + new AesCtrHmacAeadProtoKeySerializerImpl(SerializeKey); return *serializer; } diff --git a/cc/signature/BUILD.bazel b/cc/signature/BUILD.bazel index 5ca87a7db..4a83a44fb 100644 --- a/cc/signature/BUILD.bazel +++ b/cc/signature/BUILD.bazel @@ -880,7 +880,6 @@ cc_library( "//proto:tink_cc_proto", "//util:status", "//util:statusor", - "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/status", "@com_google_absl//absl/strings:string_view", "@com_google_absl//absl/types:optional", diff --git a/cc/signature/CMakeLists.txt b/cc/signature/CMakeLists.txt index f1d4cc743..ef6f5fcda 100644 --- a/cc/signature/CMakeLists.txt +++ b/cc/signature/CMakeLists.txt @@ -823,7 +823,6 @@ tink_cc_library( tink::signature::ecdsa_parameters tink::signature::ecdsa_private_key tink::signature::ecdsa_public_key - absl::no_destructor absl::status absl::string_view absl::optional diff --git a/cc/signature/ecdsa_proto_serialization.cc b/cc/signature/ecdsa_proto_serialization.cc index 52e00876e..95833d430 100644 --- a/cc/signature/ecdsa_proto_serialization.cc +++ b/cc/signature/ecdsa_proto_serialization.cc @@ -17,7 +17,6 @@ #include "tink/signature/ecdsa_proto_serialization.h" #include -#include "absl/base/no_destructor.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/optional.h" @@ -506,38 +505,38 @@ util::StatusOr SerializePrivateKey( } EcdsaProtoParametersParserImpl& EcdsaProtoParametersParser() { - static absl::NoDestructor parser( - kPrivateTypeUrl, ParseParameters); + static auto* parser = + new EcdsaProtoParametersParserImpl(kPrivateTypeUrl, ParseParameters); return *parser; } EcdsaProtoParametersSerializerImpl& EcdsaProtoParametersSerializer() { - static absl::NoDestructor serializer( + static auto* serializer = new EcdsaProtoParametersSerializerImpl( kPrivateTypeUrl, SerializeParameters); return *serializer; } EcdsaProtoPublicKeyParserImpl& EcdsaProtoPublicKeyParser() { - static absl::NoDestructor parser( - kPublicTypeUrl, ParsePublicKey); + static auto* parser = + new EcdsaProtoPublicKeyParserImpl(kPublicTypeUrl, ParsePublicKey); return *parser; } EcdsaProtoPublicKeySerializerImpl& EcdsaProtoPublicKeySerializer() { - static absl::NoDestructor serializer( - SerializePublicKey); + static auto* serializer = + new EcdsaProtoPublicKeySerializerImpl(SerializePublicKey); return *serializer; } EcdsaProtoPrivateKeyParserImpl& EcdsaProtoPrivateKeyParser() { - static absl::NoDestructor parser( - kPrivateTypeUrl, ParsePrivateKey); + static auto* parser = + new EcdsaProtoPrivateKeyParserImpl(kPrivateTypeUrl, ParsePrivateKey); return *parser; } EcdsaProtoPrivateKeySerializerImpl& EcdsaProtoPrivateKeySerializer() { - static absl::NoDestructor serializer( - SerializePrivateKey); + static auto* serializer = + new EcdsaProtoPrivateKeySerializerImpl(SerializePrivateKey); return *serializer; } } // namespace -- cgit v1.2.3