提交 3e49f425 编写于 作者: W Wang Guibao 提交者: GitHub

Merge pull request #26 from wangguibao/fix_gcc5_build_error

Fix GCC5.4 build error
...@@ -116,7 +116,7 @@ class OpChannel : public Channel { ...@@ -116,7 +116,7 @@ class OpChannel : public Channel {
} }
google::protobuf::Message* message_impl(derived_from_message<true>) { google::protobuf::Message* message_impl(derived_from_message<true>) {
return dynamic_cast<const google::protobuf::Message*>(&_data); return dynamic_cast<google::protobuf::Message*>(&_data);
} }
google::protobuf::Message* message_impl(derived_from_message<false>) { google::protobuf::Message* message_impl(derived_from_message<false>) {
......
...@@ -4,12 +4,8 @@ TOTAL_ERRORS=0 ...@@ -4,12 +4,8 @@ TOTAL_ERRORS=0
# The trick to remove deleted files: https://stackoverflow.com/a/2413151 # The trick to remove deleted files: https://stackoverflow.com/a/2413151
for file in $(git diff --cached --name-status | awk '$1 != "D" {print $2}'); do for file in $(git diff --cached --name-status | awk '$1 != "D" {print $2}'); do
if [[ $file =~ ^(paddle/legacy/api/.*|paddle/legacy/capi/.*|paddle/contrib/.*|paddle/legacy/cuda/.*|paddle/legacy/function/.*|paddle/legacy/gserver/.*|paddle/legacy/math/.*|paddle/legacy/optimizer/.*|paddle/legacy/parameter/.*|paddle/legacy/pserver/.*|paddle/legacy/trainer/.*|paddle/legacy/utils/.*|paddle/testing/TestUtil.*|patches/grpc/.*) ]]; then cpplint --filter=-readability/fn_size $file;
continue; TOTAL_ERRORS=$(expr $TOTAL_ERRORS + $?);
else
cpplint --filter=-readability/fn_size $file;
TOTAL_ERRORS=$(expr $TOTAL_ERRORS + $?);
fi
done done
exit $TOTAL_ERRORS exit $TOTAL_ERRORS
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册