aboutsummaryrefslogtreecommitdiff
path: root/cc/registry.h
diff options
context:
space:
mode:
authortholenst <tholenst@google.com>2022-09-14 02:24:12 -0700
committerCopybara-Service <copybara-worker@google.com>2022-09-14 02:25:12 -0700
commitf7397941e9900c06b03d0845bd897965ab2c1fd4 (patch)
tree6ba31debc5db7d8b7711105ad68872f5c7cf04d4 /cc/registry.h
parent104501a037a9c1f88e3b7a50537464c9b6873c90 (diff)
downloadtink-f7397941e9900c06b03d0845bd897965ab2c1fd4.tar.gz
Mark C++ catalogues for Tink 2 deletion.
PiperOrigin-RevId: 474238613
Diffstat (limited to 'cc/registry.h')
-rw-r--r--cc/registry.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/cc/registry.h b/cc/registry.h
index 29e38d2d0..88ad127fc 100644
--- a/cc/registry.h
+++ b/cc/registry.h
@@ -50,12 +50,13 @@ namespace tink {
// and KeyManagers.
class Registry {
public:
+ // TINK-PENDING-REMOVAL-IN-2.0.0-START
// Returns a catalogue with the given name (if any found).
// Keeps the ownership of the catalogue.
template <class P>
ABSL_DEPRECATED("Catalogues are not supported anymore.")
static crypto::tink::util::StatusOr<const Catalogue<P>*> get_catalogue(
- absl::string_view catalogue_name) {
+ absl::string_view catalogue_name) {
return internal::RegistryImpl::GlobalInstance().get_catalogue<P>(
catalogue_name);
}
@@ -83,9 +84,11 @@ class Registry {
template <class P>
ABSL_DEPRECATED("Use AddCatalogue with a unique_ptr input instead.")
static crypto::tink::util::Status
- AddCatalogue(absl::string_view catalogue_name, Catalogue<P>* catalogue) {
+ AddCatalogue(absl::string_view catalogue_name,
+ Catalogue<P>* catalogue) {
return AddCatalogue(catalogue_name, absl::WrapUnique(catalogue));
}
+ // TINK-PENDING-REMOVAL-IN-2.0.0-END
// Registers the given 'manager' for the key type 'manager->get_key_type()'.
template <class ConcreteKeyManager>