diff options
| author |  yang-g <yangg@google.com> | 2015-01-13 12:35:31 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-01-13 12:35:31 -0800 |
| commit | 52d4389009dedec185a8c07670d043b2e173f8d9 (patch) | |
| tree | dfbd27c9412084bf50c5f4a966e99552bd89815b /src | |
| parent | 6469cbfe20273e024f25b4d49896814451809c36 (diff) | |
| parent | c688a67689d3c1924ba0e7575fe1476a0f15bc4f (diff) | |
Merge pull request #6 from ctiller/testcpp
Fix and run C++ tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/go_generator.cc | 4 | ||||
| -rw-r--r-- | src/compiler/go_generator.h | 2 | ||||
| -rw-r--r-- | src/core/iomgr/pollset.h | 1 |
3 files changed, 4 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 diff --git a/src/core/iomgr/pollset.h b/src/core/iomgr/pollset.h index 7374a4ec13..36d80d5c29 100644 --- a/src/core/iomgr/pollset.h +++ b/src/core/iomgr/pollset.h @@ -35,6 +35,7 @@ #define __GRPC_INTERNAL_IOMGR_POLLSET_H_ #include <grpc/support/port_platform.h> +#include <grpc/support/time.h> /* A grpc_pollset is a set of file descriptors that a higher level item is interested in. For example: |