From 0629810b145187575bc26c910dded0d24c64569d Mon Sep 17 00:00:00 2001
From: Shawn Willden <swillden@google.com>
Date: Mon, 25 May 2015 23:12:48 -0600
Subject: Another refactor, deleting AbstractFactoryRegistry.

I should have known better than to make these singletons to begin
with.  Globals create problems.  This undoes that mistake.

Change-Id: Idf61d5f72e3c34b5c4ddb27cc94b05f506561743
---
 key.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'key.cpp')

diff --git a/key.cpp b/key.cpp
index 776ca1b..eb828e1 100644
--- a/key.cpp
+++ b/key.cpp
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include <assert.h>
+
 #include "key.h"
 
 #include <openssl/x509.h>
@@ -22,9 +24,6 @@
 
 namespace keymaster {
 
-/* static */
-template <> KeyFactoryRegistry* KeyFactoryRegistry::instance_ptr = 0;
-
 Key::Key(const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforced,
          keymaster_error_t* error) {
     assert(error);
@@ -34,4 +33,5 @@ Key::Key(const AuthorizationSet& hw_enforced, const AuthorizationSet& sw_enforce
     if (authorizations_.is_valid() != AuthorizationSet::OK)
         *error = KM_ERROR_MEMORY_ALLOCATION_FAILED;
 }
+
 }  // namespace keymaster
-- 
cgit v1.2.3