diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-10-16 11:01:12 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-10-16 11:01:12 -0700 |
| commit | ce386533728a9708bd903645ef09ed679d3fc531 (patch) | |
| tree | 727b11a188c2d8103ebd47396915f4109ad71251 /test/cpp/util/config_grpc_cli.h | |
| parent | 4377cbadaf6465660058304bca0f502f92d06a1e (diff) | |
| parent | 17048446cc034eec2c35d16eab3e1640453111ec (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-pagination
Diffstat (limited to 'test/cpp/util/config_grpc_cli.h')
| -rw-r--r-- | test/cpp/util/config_grpc_cli.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/cpp/util/config_grpc_cli.h b/test/cpp/util/config_grpc_cli.h index 358884196d..1df7b36e2e 100644 --- a/test/cpp/util/config_grpc_cli.h +++ b/test/cpp/util/config_grpc_cli.h @@ -40,6 +40,11 @@ #define GRPC_CUSTOM_TEXTFORMAT ::google::protobuf::TextFormat #endif +#ifndef GRPC_CUSTOM_JSONUTIL +#include <google/protobuf/util/json_util.h> +#define GRPC_CUSTOM_JSONUTIL ::google::protobuf::util +#endif + #ifndef GRPC_CUSTOM_DISKSOURCETREE #include <google/protobuf/compiler/importer.h> #define GRPC_CUSTOM_DISKSOURCETREE ::google::protobuf::compiler::DiskSourceTree @@ -58,6 +63,8 @@ typedef GRPC_CUSTOM_MERGEDDESCRIPTORDATABASE MergedDescriptorDatabase; typedef GRPC_CUSTOM_TEXTFORMAT TextFormat; +namespace json = GRPC_CUSTOM_JSONUTIL; + namespace compiler { typedef GRPC_CUSTOM_DISKSOURCETREE DiskSourceTree; typedef GRPC_CUSTOM_IMPORTER Importer; |