diff options
| author | Jeff Davidson <jpd@google.com> | 2015-01-15 22:48:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 22:48:58 +0000 |
| commit | 77a6b2f4cdd580d57630f079db1d908d7fd90a54 (patch) | |
| tree | 586f7d5e9a7e05af45d0e821188097c0faa96219 /src/google/protobuf/compiler/cpp/cpp_service.h | |
| parent | c7c25812eb19d080087b71e08bfe35aff9f21433 (diff) | |
| parent | a3b2a6da25a76f17c73d31def3952feb0fd2296e (diff) | |
| download | external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.zip external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.tar.gz external_protobuf-77a6b2f4cdd580d57630f079db1d908d7fd90a54.tar.bz2 | |
Merge "Update protobuf library from 2.3 to 2.6."
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_service.h')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_service.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_service.h b/src/google/protobuf/compiler/cpp/cpp_service.h index 10e9dd3..493f314 100644 --- a/src/google/protobuf/compiler/cpp/cpp_service.h +++ b/src/google/protobuf/compiler/cpp/cpp_service.h @@ -37,7 +37,7 @@ #include <map> #include <string> -#include <google/protobuf/stubs/common.h> +#include <google/protobuf/compiler/cpp/cpp_options.h> #include <google/protobuf/descriptor.h> namespace google { @@ -55,7 +55,7 @@ class ServiceGenerator { public: // See generator.cc for the meaning of dllexport_decl. explicit ServiceGenerator(const ServiceDescriptor* descriptor, - const string& dllexport_decl); + const Options& options); ~ServiceGenerator(); // Header stuff. |