From 9b62482e15b9360163ff0d6a8d03cc6e18e97485 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 12 Jan 2015 16:59:48 -0800
Subject: [PATCH] Make the go code generator compile

---
 src/compiler/go_generator.cc | 4 ++--
 src/compiler/go_generator.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/go_generator.cc b/src/compiler/go_generator.cc
index 8beae8dcccf..cf5bb11a19b 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 fd5a05e5374..5744345b563 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