From 7698171ebbaa2842a6732ac8464c4012fda559d6 Mon Sep 17 00:00:00 2001
From: paulavidas <paulavidas@google.com>
Date: Tue, 30 Jul 2019 06:33:16 -0700
Subject: [PATCH] Deprecate Catalogue class.
PiperOrigin-RevId: 260703166
---
cc/BUILD.bazel | 1 +
cc/CMakeLists.txt | 1 +
cc/catalogue.h | 13 +++----------
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/cc/BUILD.bazel b/cc/BUILD.bazel
index 450c17490..fac0e092a 100644
--- a/cc/BUILD.bazel
+++ b/cc/BUILD.bazel
@@ -366,6 +366,7 @@ cc_library(
deps = [
":key_manager",
"//cc/util:statusor",
+ "@com_google_absl//absl/base:core_headers",
],
)
diff --git a/cc/CMakeLists.txt b/cc/CMakeLists.txt
index ab91d775c..e3ff9dbae 100644
--- a/cc/CMakeLists.txt
+++ b/cc/CMakeLists.txt
@@ -308,6 +308,7 @@ tink_cc_library(
DEPS
tink::core::key_manager
tink::util::statusor
+ absl::base
)
tink_cc_library(
diff --git a/cc/catalogue.h b/cc/catalogue.h
index aa7acf8d4..932fa239b 100644
--- a/cc/catalogue.h
+++ b/cc/catalogue.h
@@ -17,23 +17,16 @@
#ifndef TINK_CATALOGUE_H_
#define TINK_CATALOGUE_H_
+#include "absl/base/macros.h"
#include "tink/key_manager.h"
#include "tink/util/statusor.h"
namespace crypto {
namespace tink {
-// A catalogue of KeyManager objects.
-//
-// It is basically a map from a (key type, primitive name)-tuple to
-// KeyManager-objects, that determine the implementation that handles
-// the keys of the given key type.
-//
-// Tink includes default per-primitive catalogues, but it also
-// supports custom catalogues to enable user-defined configuration of
-// run-time environment via Registry.
+// This class is deprecated. We don't support catalogues anymore.
template <class P>
-class Catalogue {
+class ABSL_DEPRECATED("We don't support catalogues anymore.") Catalogue {
public:
// Returns a key manager for the given 'type_url', 'primitive_name',
// and version at least 'min_version' (if any found).
--
GitLab