From 1cb088441a366f7ed06a8ea06dcb49bde9e1f8b7 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Tue, 8 Nov 2016 07:05:33 -0800
Subject: [PATCH] s/std::string/grpc::string/g

---
 include/grpc++/grpc++.h                         | 2 +-
 templates/src/cpp/common/version_cc.cc.template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/grpc++/grpc++.h b/include/grpc++/grpc++.h
index ce355e492d8..36d65d6ee1e 100644
--- a/include/grpc++/grpc++.h
+++ b/include/grpc++/grpc++.h
@@ -68,7 +68,7 @@
 // IWYU pragma: end_exports
 
 namespace grpc {
-std::string Version();
+grpc::string Version();
 }  // namespace grpc
 
 #endif  // GRPCXX_GRPCXX_H
diff --git a/templates/src/cpp/common/version_cc.cc.template b/templates/src/cpp/common/version_cc.cc.template
index 60f0b3bb51b..d14e974f567 100644
--- a/templates/src/cpp/common/version_cc.cc.template
+++ b/templates/src/cpp/common/version_cc.cc.template
@@ -39,5 +39,5 @@
   #include <grpc++/grpc++.h>
 
   namespace grpc {
-  std::string Version() { return "${settings.cpp_version}"; }
+  grpc::string Version() { return "${settings.cpp_version}"; }
   }