diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-10-24 17:25:51 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-10-24 17:25:51 -0700 |
| commit | 4fa389b1374be55b37da3cb272b346b0406e62ac (patch) | |
| tree | be85c2748e51e2d7c1357d0170af90a442d4961d /test/cpp/util | |
| parent | 482641501cd5ba0060b43b363efae2e9292cd938 (diff) | |
Unifying grpc build hacks
Diffstat (limited to 'test/cpp/util')
| -rw-r--r-- | test/cpp/util/config_grpc_cli.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/test/cpp/util/config_grpc_cli.h b/test/cpp/util/config_grpc_cli.h index 1df7b36e2e..358884196d 100644 --- a/test/cpp/util/config_grpc_cli.h +++ b/test/cpp/util/config_grpc_cli.h @@ -40,11 +40,6 @@ #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 @@ -63,8 +58,6 @@ 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; |