diff options
| author | Bartosz Przydatek <przydatek@google.com> | 2017-06-13 18:03:45 +0200 |
|---|---|---|
| committer | Thai Duong <thaidn@google.com> | 2017-06-22 22:14:52 -0700 |
| commit | 5181246a252f2ca8b5697e625838ad58ae76c0a3 (patch) | |
| tree | 414783cbf5c97a30d982f49afe9dd8acd14b95eb /cc/registry.h | |
| parent | da961095106c7ad6ca8656fb27dc07349c3308d7 (diff) | |
| download | tink-5181246a252f2ca8b5697e625838ad58ae76c0a3.tar.gz | |
Adding cross-language tests for hybrid encryption.
Change-Id: I15136873c1b4a00b27169084f354ffbd9a0c9a53
ORIGINAL_AUTHOR=Bartosz Przydatek <przydatek@google.com>
GitOrigin-RevId: 47c154adf3389b287362fd4a2bde41acf5b53682
Diffstat (limited to 'cc/registry.h')
| -rw-r--r-- | cc/registry.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cc/registry.h b/cc/registry.h index 58d9b81a9..40df34e35 100644 --- a/cc/registry.h +++ b/cc/registry.h @@ -54,7 +54,10 @@ namespace tink { // and KeyManagers. class Registry { public: - static Registry& get_default_registry(); + static Registry& get_default_registry() { + return *(default_registry_.get()); + } + // Registers the given 'manager' for the key type identified by 'type_url'. // Takes ownership of 'manager', which must be non-nullptr. @@ -112,11 +115,6 @@ void delete_manager(void* t) { delete static_cast<KeyManager<P>*>(t); } -// static -Registry& Registry::get_default_registry() { - return *(default_registry_.get()); -} - template <class P> util::Status Registry::RegisterKeyManager( google::protobuf::StringPiece type_url, KeyManager<P>* manager) { |