Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10000 from yang-g/grpc_pb_h

Browse Source 
Include x.pb.h instead of x.grpc.pb.h for message-only protos
pull/9806/head
Yang Gao 8 years ago committed by GitHub
parent 3cafec2f55 d0084c220e
commit cedfa76471
11 changed files with 16 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      test/cpp/interop/http2_client.cc
  2. 2
      test/cpp/interop/http2_client.h
  3. 4
      test/cpp/interop/interop_client.cc
  4. 2
      test/cpp/interop/interop_client.h
  5. 4
      test/cpp/interop/interop_server.cc
  6. 4
      test/cpp/interop/reconnect_interop_client.cc
  7. 4
      test/cpp/interop/reconnect_interop_server.cc
  8. 2
      test/cpp/qps/client.h
  9. 2
      test/cpp/qps/driver.h
  10. 2
      test/cpp/qps/histogram.h
  11. 4
      test/cpp/qps/server.h

2
test/cpp/interop/http2_client.cc
Unescape View File

@ -41,7 +41,7 @@
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "src/core/lib/transport/byte_stream.h" #include "src/core/lib/transport/byte_stream.h"
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
#include "test/cpp/interop/http2_client.h" #include "test/cpp/interop/http2_client.h"

2
test/cpp/interop/http2_client.h
Unescape View File

@ -38,7 +38,7 @@
#include <grpc++/channel.h> #include <grpc++/channel.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
namespace grpc { namespace grpc {

4
test/cpp/interop/interop_client.cc
Unescape View File

@ -46,8 +46,8 @@
#include <grpc/support/useful.h> #include <grpc/support/useful.h>
#include "src/core/lib/transport/byte_stream.h" #include "src/core/lib/transport/byte_stream.h"
#include "src/proto/grpc/testing/empty.grpc.pb.h" #include "src/proto/grpc/testing/empty.pb.h"
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
#include "test/cpp/interop/client_helper.h" #include "test/cpp/interop/client_helper.h"
#include "test/cpp/interop/interop_client.h" #include "test/cpp/interop/interop_client.h"

2
test/cpp/interop/interop_client.h
Unescape View File

@ -38,7 +38,7 @@
#include <grpc++/channel.h> #include <grpc++/channel.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
namespace grpc { namespace grpc {

4
test/cpp/interop/interop_server.cc
Unescape View File

@ -48,8 +48,8 @@
#include "src/core/lib/support/string.h" #include "src/core/lib/support/string.h"
#include "src/core/lib/transport/byte_stream.h" #include "src/core/lib/transport/byte_stream.h"
#include "src/proto/grpc/testing/empty.grpc.pb.h" #include "src/proto/grpc/testing/empty.pb.h"
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
#include "test/cpp/interop/server_helper.h" #include "test/cpp/interop/server_helper.h"
#include "test/cpp/util/test_config.h" #include "test/cpp/util/test_config.h"

4
test/cpp/interop/reconnect_interop_client.cc
Unescape View File

@ -40,8 +40,8 @@
#include <grpc++/support/channel_arguments.h> #include <grpc++/support/channel_arguments.h>
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/proto/grpc/testing/empty.grpc.pb.h" #include "src/proto/grpc/testing/empty.pb.h"
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
#include "test/cpp/util/create_test_channel.h" #include "test/cpp/util/create_test_channel.h"
#include "test/cpp/util/test_config.h" #include "test/cpp/util/test_config.h"

4
test/cpp/interop/reconnect_interop_server.cc
Unescape View File

@ -47,8 +47,8 @@
#include <grpc/grpc.h> #include <grpc/grpc.h>
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include "src/proto/grpc/testing/empty.grpc.pb.h" #include "src/proto/grpc/testing/empty.pb.h"
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "src/proto/grpc/testing/test.grpc.pb.h" #include "src/proto/grpc/testing/test.grpc.pb.h"
#include "test/core/util/reconnect_server.h" #include "test/core/util/reconnect_server.h"
#include "test/cpp/util/test_config.h" #include "test/cpp/util/test_config.h"

2
test/cpp/qps/client.h
Unescape View File

@ -46,7 +46,7 @@
#include <grpc/support/log.h> #include <grpc/support/log.h>
#include <grpc/support/time.h> #include <grpc/support/time.h>
#include "src/proto/grpc/testing/payloads.grpc.pb.h" #include "src/proto/grpc/testing/payloads.pb.h"
#include "src/proto/grpc/testing/services.grpc.pb.h" #include "src/proto/grpc/testing/services.grpc.pb.h"
#include "test/cpp/qps/histogram.h" #include "test/cpp/qps/histogram.h"

2
test/cpp/qps/driver.h
Unescape View File

@ -36,7 +36,7 @@
#include <memory> #include <memory>
#include "src/proto/grpc/testing/control.grpc.pb.h" #include "src/proto/grpc/testing/control.pb.h"
#include "test/cpp/qps/histogram.h" #include "test/cpp/qps/histogram.h"
namespace grpc { namespace grpc {

2
test/cpp/qps/histogram.h
Unescape View File

@ -35,7 +35,7 @@
#define TEST_QPS_HISTOGRAM_H #define TEST_QPS_HISTOGRAM_H
#include <grpc/support/histogram.h> #include <grpc/support/histogram.h>
#include "src/proto/grpc/testing/stats.grpc.pb.h" #include "src/proto/grpc/testing/stats.pb.h"
namespace grpc { namespace grpc {
namespace testing { namespace testing {

4
test/cpp/qps/server.h
Unescape View File

@ -38,8 +38,8 @@
#include <grpc/support/cpu.h> #include <grpc/support/cpu.h>
#include <vector> #include <vector>
#include "src/proto/grpc/testing/control.grpc.pb.h" #include "src/proto/grpc/testing/control.pb.h"
#include "src/proto/grpc/testing/messages.grpc.pb.h" #include "src/proto/grpc/testing/messages.pb.h"
#include "test/core/end2end/data/ssl_test_data.h" #include "test/core/end2end/data/ssl_test_data.h"
#include "test/core/util/port.h" #include "test/core/util/port.h"
#include "test/cpp/qps/usage_timer.h" #include "test/cpp/qps/usage_timer.h"

Write Preview
Loading…
Cancel
Save