Skip to content

Commit

Permalink
Merge pull request #180 from stanley-cheung/grpc-sync
Browse files Browse the repository at this point in the history 
gRPC Sync
  • Loading branch information
@fengli79
fengli79 authored May 3, 2018
2 parents 0f543e5 + 404d489 commit 729a98d
Show file tree
Hide file tree
Showing 33 changed files with 45 additions and 44 deletions.
2 changes: 1 addition & 1 deletion net/grpc/gateway/backend/backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "net/grpc/gateway/runtime/request.h"
#include "net/grpc/gateway/runtime/tag.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/backend/grpc_backend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "net/grpc/gateway/runtime/request.h"
#include "net/grpc/gateway/runtime/response.h"
#include "net/grpc/gateway/runtime/tag.h"
#include "third_party/grpc/include/grpc++/support/config.h"
#include "third_party/grpc/include/grpcpp/support/config.h"
#include "third_party/grpc/include/grpc/grpc.h"

namespace grpc {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/b64_proto_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "net/grpc/gateway/codec/base64.h"
#include "net/grpc/gateway/codec/proto_decoder.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/b64_stream_body_decoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include <vector>

#include "net/grpc/gateway/codec/decoder.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/b64_stream_body_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "net/grpc/gateway/codec/base64.h"
#include "net/grpc/gateway/codec/stream_body_decoder.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
6 changes: 3 additions & 3 deletions net/grpc/gateway/codec/b64_stream_body_encoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include "net/grpc/gateway/codec/base64.h"
#include "net/grpc/gateway/codec/stream_body_encoder.h"
#include "net/grpc/gateway/runtime/types.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/base64.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <memory>
#include <vector>

#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <memory>
#include <vector>

#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/encoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define NET_GRPC_GATEWAY_CODEC_ENCODER_H_

#include "net/grpc/gateway/runtime/types.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/grpc_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <memory>

#include "net/grpc/gateway/codec/decoder.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/grpc_encoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "net/grpc/gateway/codec/grpc_encoder.h"

#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/grpc_web_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <memory>

#include "net/grpc/gateway/codec/decoder.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/grpc_web_encoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <vector>

#include "net/grpc/gateway/runtime/types.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/json_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#include "net/grpc/gateway/codec/base64.h"
#include "net/grpc/gateway/codec/decoder.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/json_encoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "net/grpc/gateway/protos/pair.pb.h"
#include "net/grpc/gateway/protos/stream_body.pb.h"
#include "net/grpc/gateway/runtime/constants.h"
#include "third_party/grpc/include/grpc++/support/config.h"
#include "third_party/grpc/include/grpcpp/support/config.h"
#include "third_party/grpc/include/grpc/slice.h"

namespace grpc {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/json_encoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#include "net/grpc/gateway/codec/base64.h"
#include "net/grpc/gateway/codec/encoder.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/proto_decoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include "net/grpc/gateway/codec/proto_decoder.h"

#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/proto_encoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include "net/grpc/gateway/protos/stream_body.pb.h"
#include "net/grpc/gateway/runtime/constants.h"
#include "net/grpc/gateway/runtime/types.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"
#include "third_party/grpc/include/grpc/slice.h"

namespace grpc {
Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/codec/stream_body_decoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <vector>

#include "net/grpc/gateway/codec/decoder.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/stream_body_encoder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "net/grpc/gateway/protos/pair.pb.h"
#include "net/grpc/gateway/protos/stream_body.pb.h"
#include "net/grpc/gateway/runtime/constants.h"
#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/codec/stream_body_encoder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#define NET_GRPC_GATEWAY_CODEC_STREAM_BODY_ENCODER_H_

#include "net/grpc/gateway/codec/encoder.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/examples/echo/echo_server.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
*/

#include <grpc++/grpc++.h>
#include <grpcpp/grpcpp.h>
#include <unistd.h>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/examples/echo/echo_service_impl.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include "net/grpc/gateway/examples/echo/echo_service_impl.h"

#include <grpc++/grpc++.h>
#include <grpcpp/grpcpp.h>
#include <unistd.h>
#include <string>

Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/examples/echo/echo_service_impl.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*
*/

#include <grpc++/grpc++.h>
#include <grpcpp/grpcpp.h>
#include <unistd.h>
#include <string>

Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/frontend/nginx_http_frontend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#include "net/grpc/gateway/codec/encoder.h"
#include "net/grpc/gateway/frontend/frontend.h"
#include "net/grpc/gateway/runtime/constants.h"
#include "third_party/grpc/include/grpc++/support/byte_buffer.h"
#include "third_party/grpc/include/grpc++/support/string_ref.h"
#include "third_party/grpc/include/grpcpp/support/byte_buffer.h"
#include "third_party/grpc/include/grpcpp/support/string_ref.h"

#ifdef __cplusplus
extern "C" {
Expand Down
1 change: 1 addition & 0 deletions net/grpc/gateway/log.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#define NET_GRPC_GATEWAY_LOG_H_

#include "third_party/grpc/include/grpc/support/log.h"
#include <inttypes.h>

#define INFO_0(f) gpr_log(GPR_INFO, f);
#define INFO_1(f, v1) gpr_log(GPR_INFO, f, v1);
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/nginx_utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "net/grpc/gateway/nginx_includes.h"

#include "net/grpc/gateway/log.h"
#include "third_party/grpc/include/grpc++/support/string_ref.h"
#include "third_party/grpc/include/grpcpp/support/string_ref.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/runtime/response.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <memory>

#include "net/grpc/gateway/runtime/types.h"
#include "third_party/grpc/include/grpc++/support/status.h"
#include "third_party/grpc/include/grpcpp/support/status.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/runtime/runtime.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "net/grpc/gateway/codec/stream_body_encoder.h"
#include "net/grpc/gateway/frontend/nginx_http_frontend.h"
#include "net/grpc/gateway/runtime/constants.h"
#include "third_party/grpc/include/grpc++/support/config.h"
#include "third_party/grpc/include/grpcpp/support/config.h"
#include "third_party/grpc/include/grpc/grpc.h"
#include "third_party/grpc/include/grpc/grpc_security.h"

Expand Down
4 changes: 2 additions & 2 deletions net/grpc/gateway/runtime/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <utility>
#include <vector>

#include "third_party/grpc/include/grpc++/support/slice.h"
#include "third_party/grpc/include/grpc++/support/string_ref.h"
#include "third_party/grpc/include/grpcpp/support/slice.h"
#include "third_party/grpc/include/grpcpp/support/string_ref.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion net/grpc/gateway/utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#ifndef NET_GRPC_GATEWAY_UTILS_H_
#define NET_GRPC_GATEWAY_UTILS_H_

#include "third_party/grpc/include/grpc++/support/config.h"
#include "third_party/grpc/include/grpcpp/support/config.h"

namespace grpc {
namespace gateway {
Expand Down
2 changes: 1 addition & 1 deletion scripts/init_submodules.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ cd "$(dirname "$0")"/..
git submodule update --init
cd third_party/closure-library && git checkout tags/v20171112 -f && cd ../..
cd third_party/openssl && git checkout tags/OpenSSL_1_0_2h -f && cd ../..
cd third_party/grpc && git checkout 8b875ac -f && git submodule update --init && cd ../..
cd third_party/grpc && git checkout ac0188e -f && git submodule update --init && cd ../..
2 changes: 1 addition & 1 deletion third_party/grpc
Submodule grpc updated 1099 files

0 comments on commit 729a98d

Please sign in to comment.