Remove Catalogue APIs.

PiperOrigin-RevId: 514652127

1 files changed, 0 insertions, 40 deletions

diff --git a/cc/registry.h b/cc/registry.h
index ea7be608b..75564c46e 100644
--- a/cc/registry.h
+++ b/cc/registry.h
@@ -50,46 +50,6 @@ 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) {
-    return internal::RegistryImpl::GlobalInstance().get_catalogue<P>(
-        catalogue_name);
-  }
-
-  // Adds the given 'catalogue' under the specified 'catalogue_name',
-  // to enable custom configuration of key types and key managers.
-  //
-  // Adding a custom catalogue should be a one-time operation,
-  // and fails if the given 'catalogue' tries to override
-  // an existing, different catalogue for the specified name.
-  template <class ConcreteCatalogue>
-  ABSL_DEPRECATED("Catalogues are not supported anymore.")
-  static crypto::tink::util::Status
-      AddCatalogue(absl::string_view catalogue_name,
-                   std::unique_ptr<ConcreteCatalogue> catalogue) {
-    return internal::RegistryImpl::GlobalInstance().AddCatalogue(
-        catalogue_name, catalogue.release());
-  }
-
-  // AddCatalogue has the same functionality as the overload which uses a
-  // unique_ptr and which should be preferred.
-  //
-  // Takes ownership of 'catalogue', which must be non-nullptr (in case of
-  // failure, 'catalogue' is deleted).
-  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) {
-    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>
   static crypto::tink::util::Status RegisterKeyManager(