aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-11-08 07:47:24 -0800
committerGravatar Craig Tiller <ctiller@google.com>2016-11-08 07:47:24 -0800
commitd56dae0767af60e3f0d8562a05fd61ba1578325c (patch)
treef5e9e04fc39b7dc228a3fe5777ada8c39e5b2f31 /src/cpp
parent31606bdb34474d8728350ad45baf0e91b590b041 (diff)
Merge
Diffstat (limited to 'src/cpp')
-rw-r--r--src/cpp/common/version_cc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/common/version_cc.cc b/src/cpp/common/version_cc.cc
index 826ddfba61..7be338417f 100644
--- a/src/cpp/common/version_cc.cc
+++ b/src/cpp/common/version_cc.cc
@@ -37,5 +37,5 @@
#include <grpc++/grpc++.h>
namespace grpc {
-std::string Version() { return "1.1.0-dev"; }
+grpc::string Version() { return "1.1.0-dev"; }
}