diff options
author | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
---|---|---|
committer | yang-g <yangg@google.com> | 2016-04-26 16:23:53 -0700 |
commit | 6b16aaae96d7f8664870da8b4e36ea0da10d667e (patch) | |
tree | d3b6915ba019bae703f6e6d87351a454be2a3aba /src/compiler/cpp_generator.h | |
parent | 57d1e082689c96e2721122748b08583d6b63d394 (diff) | |
parent | a4e7ecab1a512bae1c40b9b301661ba24677b0ed (diff) |
merge and resolve conflict
Diffstat (limited to 'src/compiler/cpp_generator.h')
-rw-r--r-- | src/compiler/cpp_generator.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/compiler/cpp_generator.h b/src/compiler/cpp_generator.h index 02f95f8cf6..2a003b1069 100644 --- a/src/compiler/cpp_generator.h +++ b/src/compiler/cpp_generator.h @@ -114,8 +114,11 @@ struct File : public CommentHolder { virtual grpc::string filename() const = 0; virtual grpc::string filename_without_ext() const = 0; + virtual grpc::string message_header_ext() const = 0; + virtual grpc::string service_header_ext() const = 0; virtual grpc::string package() const = 0; virtual std::vector<grpc::string> package_parts() const = 0; + virtual grpc::string additional_headers() const = 0; virtual int service_count() const = 0; virtual std::unique_ptr<const Service> service(int i) const = 0; |