aboutsummaryrefslogtreecommitdiff
path: root/cc/registry.h
diff options
context:
space:
mode:
authorambrosin <ambrosin@google.com>2023-03-07 04:08:24 -0800
committerCopybara-Service <copybara-worker@google.com>2023-03-07 04:09:36 -0800
commit7a12b021ce25a1b51de40fedce5e705ac257349f (patch)
tree935f184079ff1c3fe5f721c53ef66313f5b89dfe /cc/registry.h
parent3a95fbfb56e622755f89ef34db0f527f05a84967 (diff)
downloadtink-7a12b021ce25a1b51de40fedce5e705ac257349f.tar.gz
Remove deprecated versions of RegisterKeyManager for removal.
PiperOrigin-RevId: 514689012
Diffstat (limited to 'cc/registry.h')
-rw-r--r--cc/registry.h21
1 files changed, 0 insertions, 21 deletions
diff --git a/cc/registry.h b/cc/registry.h
index 75564c46e..9507e5930 100644
--- a/cc/registry.h
+++ b/cc/registry.h
@@ -58,27 +58,6 @@ class Registry {
manager.release(), new_key_allowed);
}
- // NOLINTBEGIN(whitespace/line_length) (Formatted when commented in)
- // TINK-PENDING-REMOVAL-IN-2.0.0-START
- // Same functionality as the overload which takes a unique pointer, for
- // new_key_allowed = true.
- template <class P>
- ABSL_DEPRECATED(
- "Use RegisterKeyManager with a unique_ptr manager and new_key_allowed = "
- "true instead.")
- static crypto::tink::util::Status RegisterKeyManager(KeyManager<P>* manager) {
- return RegisterKeyManager(absl::WrapUnique(manager), true);
- }
-
- template <class P>
- ABSL_DEPRECATED("Use RegisterKeyManager with a unique_ptr manager instead.")
- static crypto::tink::util::Status RegisterKeyManager(KeyManager<P>* manager,
- bool new_key_allowed) {
- return RegisterKeyManager(absl::WrapUnique(manager), new_key_allowed);
- }
- // TINK-PENDING-REMOVAL-IN-2.0.0-END
- // NOLINTEND(whitespace/line_length)
-
template <class KTManager>
static crypto::tink::util::Status RegisterKeyTypeManager(
std::unique_ptr<KTManager> manager, bool new_key_allowed) {