You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ra...@apache.org on 2023/05/30 08:49:09 UTC

[arrow] 08/12: GH-35538: [C++] Remove unnecessary status.h include from protobuf (#35673)

This is an automated email from the ASF dual-hosted git repository.

raulcd pushed a commit to branch maint-12.0.x
in repository https://gitbox.apache.org/repos/asf/arrow.git

commit d151bdbd7d53ece213d10f27c1e39f3794f023f1
Author: Felipe Oliveira Carvalho <fe...@gmail.com>
AuthorDate: Thu May 18 17:20:53 2023 -0300

    GH-35538: [C++] Remove unnecessary status.h include from protobuf (#35673)
    
    ### Rationale for this change
    
    Newer versions of protobuf use `absl::Status` instead of `google::protobuf::util::Status`. The status variables in this file are type-annotated with `auto` and we can count on the header that declares the status-returning function we are calling to have included the header that defines `Status`.
    
    ### What changes are included in this PR?
    
    Removing an include of a protobuf header that don't exist in later versions of the library.
    
    ### Are these changes tested?
    
    I haven't tried building with protobuf 23, but I can be sure this specifically fixes the problem reported in #35538.
    
    Authored-by: Felipe Oliveira Carvalho <fe...@gmail.com>
    Signed-off-by: Weston Pace <we...@gmail.com>
---
 cpp/src/arrow/engine/substrait/serde.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cpp/src/arrow/engine/substrait/serde.cc b/cpp/src/arrow/engine/substrait/serde.cc
index 78f0ea8892..f2edd235f6 100644
--- a/cpp/src/arrow/engine/substrait/serde.cc
+++ b/cpp/src/arrow/engine/substrait/serde.cc
@@ -24,7 +24,6 @@
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 #include <google/protobuf/message.h>
-#include <google/protobuf/stubs/status.h>
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/util/message_differencer.h>
 #include <google/protobuf/util/type_resolver.h>