Fix blaze build and Lint errors.

It seems that blaze (not bazel) doesn't allow implicit conversion from StringPiece to string.

Change-Id: I76142bcb2eec0ef2754e6a9a48a3d7ea4356ad49
ORIGINAL_AUTHOR=Thai Duong <thaidn@google.com>
GitOrigin-RevId: d98cb3ead7e8342d8dd3820d727025c492959e2a

1 files changed, 6 insertions, 6 deletions

diff --git a/cc/registry.h b/cc/registry.h
index 9cdf4d032..7bff1141d 100644
--- a/cc/registry.h
+++ b/cc/registry.h
@@ -133,16 +133,16 @@ util::Status Registry::RegisterKeyManager(
                      type_url.ToString().c_str());
   }
   std::lock_guard<std::mutex> lock(maps_mutex_);
-  auto curr_manager = type_to_manager_map_.find(type_url);
+  auto curr_manager = type_to_manager_map_.find(type_url.ToString());
   if (curr_manager != type_to_manager_map_.end()) {
     return ToStatusF(util::error::ALREADY_EXISTS,
                      "A manager for type '%s' has been already registered.",
                      type_url.ToString().c_str());
   }
   type_to_manager_map_.insert(
-      std::make_pair(type_url, std::move(entry)));
+      std::make_pair(type_url.ToString(), std::move(entry)));
   type_to_primitive_map_.insert(
-      std::make_pair(type_url, typeid(P).name()));
+      std::make_pair(type_url.ToString(), typeid(P).name()));
   return util::Status::OK;
 }
 
@@ -150,19 +150,19 @@ template <class P>
 util::StatusOr<const KeyManager<P>*> Registry::get_key_manager(
     google::protobuf::StringPiece type_url) {
   std::lock_guard<std::mutex> lock(maps_mutex_);
-  auto manager_entry = type_to_manager_map_.find(type_url);
+  auto manager_entry = type_to_manager_map_.find(type_url.ToString());
   if (manager_entry == type_to_manager_map_.end()) {
     return ToStatusF(util::error::NOT_FOUND,
                      "No manager for type '%s' has been registered.",
                      type_url.ToString().c_str());
   }
-  if (type_to_primitive_map_[type_url] != typeid(P).name()) {
+  if (type_to_primitive_map_[type_url.ToString()] != typeid(P).name()) {
     return ToStatusF(util::error::INVALID_ARGUMENT,
                      "Wrong Primitive type for key type '%s': "
                      "got '%s', expected '%s'",
                      type_url.ToString().c_str(),
                      typeid(P).name(),
-                     type_to_primitive_map_[type_url]);
+                     type_to_primitive_map_[type_url.ToString()]);
   }
   return static_cast<KeyManager<P>*>(manager_entry->second.get());
 }