You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2020/04/03 16:36:43 UTC
[arrow] branch master updated: ARROW-8323: [C++] Add pragmas
wrapping proto_utils.h to disable conversion warnings
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 921aa0c ARROW-8323: [C++] Add pragmas wrapping proto_utils.h to disable conversion warnings
921aa0c is described below
commit 921aa0c3955b3fff5441b6d8517b3a331ede890f
Author: Benjamin Kietzman <be...@gmail.com>
AuthorDate: Fri Apr 3 18:36:16 2020 +0200
ARROW-8323: [C++] Add pragmas wrapping proto_utils.h to disable conversion warnings
Closes #6820 from bkietz/8323-Pin-gRPC-at-v1-27-to-avoi
Authored-by: Benjamin Kietzman <be...@gmail.com>
Signed-off-by: Krisztián Szűcs <sz...@gmail.com>
---
cpp/src/arrow/flight/customize_protobuf.h | 1 +
cpp/src/arrow/flight/serialization_internal.cc | 9 +++++++++
2 files changed, 10 insertions(+)
diff --git a/cpp/src/arrow/flight/customize_protobuf.h b/cpp/src/arrow/flight/customize_protobuf.h
index f27ab0b..c41845c 100644
--- a/cpp/src/arrow/flight/customize_protobuf.h
+++ b/cpp/src/arrow/flight/customize_protobuf.h
@@ -27,6 +27,7 @@
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4244)
+#pragma warning(disable : 4267)
#endif
#ifdef GRPCPP_PP_INCLUDE
diff --git a/cpp/src/arrow/flight/serialization_internal.cc b/cpp/src/arrow/flight/serialization_internal.cc
index 97c5026..8f0a2ef 100644
--- a/cpp/src/arrow/flight/serialization_internal.cc
+++ b/cpp/src/arrow/flight/serialization_internal.cc
@@ -24,6 +24,11 @@
#include "arrow/flight/platform.h"
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable : 4267)
+#endif
+
#include <google/protobuf/io/coded_stream.h>
#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
#include <google/protobuf/wire_format_lite.h>
@@ -37,6 +42,10 @@
#include <grpc++/impl/codegen/proto_utils.h>
#endif
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif
+
#include "arrow/buffer.h"
#include "arrow/flight/server.h"
#include "arrow/ipc/writer.h"