diff options
| author |  Mark D. Roth <roth@google.com> | 2016-11-02 08:42:49 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-11-02 08:42:49 -0700 |
| commit | 6c8492de8a27b3b6afa3533543eeac167b5c94cc (patch) | |
| tree | d487ad8a8745abfe706a92b31a5a1c54f866aead /src/cpp/ext/proto_server_reflection.h | |
| parent | f464a3700d3ca78fc35b2f3bd69c71883a849843 (diff) | |
| parent | 57f30d15185f030de0c71d6a39e533d418b2a22e (diff) | |
Merge remote-tracking branch 'upstream/master' into remove_fake_resolver
Diffstat (limited to 'src/cpp/ext/proto_server_reflection.h')
| -rw-r--r-- | src/cpp/ext/proto_server_reflection.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/cpp/ext/proto_server_reflection.h b/src/cpp/ext/proto_server_reflection.h index f66f3c2c9a..be5f062f9f 100644 --- a/src/cpp/ext/proto_server_reflection.h +++ b/src/cpp/ext/proto_server_reflection.h @@ -31,31 +31,14 @@ * */ -/* - - If the generated header `grpc++/ext/reflection.grpc.pb.h` needs to be - installed, target `grpc++_reflection` in `build.yaml` should use the - filegroup `grpc++_reflection_proto`, and GRPC_NO_GENERATED_CODE should not - be defined. - - If the server reflection library needs to generate `reflection.grpc.pb.h` - from `reflection.proto` at compile time, the generated header - `grpc++/ext/reflection.grpc.pb.h` should not be installed. In this case, - target `grpc++_reflection` should depend on `grpc++_reflection_codegen`, and - GRPC_NO_GENERATED_CODE should be defined. -*/ - #ifndef GRPC_INTERNAL_CPP_EXT_PROTO_SERVER_REFLECTION_H #define GRPC_INTERNAL_CPP_EXT_PROTO_SERVER_REFLECTION_H #include <unordered_set> #include <vector> -// GRPC_NO_GENERATED_CODE indicates generated pb files should not be used -#ifdef GRPC_NO_GENERATED_CODE -#include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" -#else -#include <grpc++/ext/reflection.grpc.pb.h> -#endif // GRPC_NO_GENERATED_CODE #include <grpc++/grpc++.h> +#include "src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h" namespace grpc { |