aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2015-01-12 16:59:48 -0800
committerGravatar Craig Tiller <ctiller@google.com>2015-01-12 16:59:48 -0800
commit9b62482e15b9360163ff0d6a8d03cc6e18e97485 (patch)
tree0b1f42200852025fb48bbed721630775b9f1b76d /src
parent27715caf6e1f22323d218f0bc2c042c7e17a167f (diff)
Make the go code generator compile
Diffstat (limited to 'src')
-rw-r--r--src/compiler/go_generator.cc4
-rw-r--r--src/compiler/go_generator.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/go_generator.cc b/src/compiler/go_generator.cc
index 8beae8dccc..cf5bb11a19 100644
--- a/src/compiler/go_generator.cc
+++ b/src/compiler/go_generator.cc
@@ -31,8 +31,6 @@
*
*/
-using namespace std;
-
#include "src/compiler/go_generator.h"
#include <cctype>
@@ -42,6 +40,8 @@ using namespace std;
#include <google/protobuf/descriptor.pb.h>
#include <google/protobuf/descriptor.h>
+using namespace std;
+
namespace grpc_go_generator {
bool NoStreaming(const google::protobuf::MethodDescriptor* method) {
diff --git a/src/compiler/go_generator.h b/src/compiler/go_generator.h
index fd5a05e537..5744345b56 100644
--- a/src/compiler/go_generator.h
+++ b/src/compiler/go_generator.h
@@ -44,7 +44,7 @@ class FileDescriptor;
namespace grpc_go_generator {
-string GetServices(const google::protobuf::FileDescriptor* file);
+std::string GetServices(const google::protobuf::FileDescriptor* file);
} // namespace grpc_go_generator