You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2023/06/22 01:58:32 UTC
[orc] branch branch-1.9 updated: ORC-1450: Stop enforcing `override` keyword rule
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.9 by this push:
new 9a95ed8e7 ORC-1450: Stop enforcing `override` keyword rule
9a95ed8e7 is described below
commit 9a95ed8e7472dc5f21fea2cfd13fb001383e45f7
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Wed Jun 21 18:58:19 2023 -0700
ORC-1450: Stop enforcing `override` keyword rule
### What changes were proposed in this pull request?
This PR aims to recover Clang 10 dev environment by stopping enforcing `override` keyword.
- This is a partial revert of #1420 because we still keep the changed other code.
- GitHub Action missed this.
- `Clang on Ubuntu 20.04` job missed this because it uses Clang 11.0.0.
- `Clang on MacOS 11` job missed this because it uses AppleClang 13.0.0.
### Why are the changes needed?
During `Apache ORC 1.9.0 Preparation`, I found that this broke `ubuntu20_jdk=11_cc=clang` docker test due to the `unknown warning group` errors.
- #1532
### How was this patch tested?
Pass the CI and do the manual testing with Docker environment.
Closes #1545 from dongjoon-hyun/CLANG10.
Authored-by: Dongjoon Hyun <do...@apache.org>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
(cherry picked from commit 568d1d60c250af1890f226c182bc15bd8cc94cf1)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
CMakeLists.txt | 4 ++--
c++/src/wrap/orc-proto-wrapper.cc | 1 -
c++/src/wrap/orc-proto-wrapper.hh | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86c1444a8..efc8d85a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,10 +130,10 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set (WARN_FLAGS "${WARN_FLAGS} -Wno-unused-macros")
endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "13.0")
- set (WARN_FLAGS "${WARN_FLAGS} -Wno-reserved-identifier")
+ set (WARN_FLAGS "${WARN_FLAGS} -Wno-reserved-identifier -Wno-suggest-destructor-override -Wno-suggest-override")
endif()
if (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "12.0")
- set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat -Wno-unknown-warning-option")
+ set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat -Wno-unknown-warning-option -Wno-suggest-override -Wno-suggest-destructor-override")
elseif (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "11.0")
set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat")
endif ()
diff --git a/c++/src/wrap/orc-proto-wrapper.cc b/c++/src/wrap/orc-proto-wrapper.cc
index 8ac55d8cd..2c9c927c3 100644
--- a/c++/src/wrap/orc-proto-wrapper.cc
+++ b/c++/src/wrap/orc-proto-wrapper.cc
@@ -37,7 +37,6 @@ DIAGNOSTIC_IGNORE("-Wmissing-variable-declarations")
DIAGNOSTIC_IGNORE("-Wnested-anon-types")
DIAGNOSTIC_IGNORE("-Wreserved-id-macro")
DIAGNOSTIC_IGNORE("-Wshorten-64-to-32")
-DIAGNOSTIC_IGNORE("-Wsuggest-destructor-override")
DIAGNOSTIC_IGNORE("-Wunknown-warning-option")
DIAGNOSTIC_IGNORE("-Wweak-vtables")
DIAGNOSTIC_IGNORE("-Wzero-as-null-pointer-constant")
diff --git a/c++/src/wrap/orc-proto-wrapper.hh b/c++/src/wrap/orc-proto-wrapper.hh
index 6c86bb83f..014c7d657 100644
--- a/c++/src/wrap/orc-proto-wrapper.hh
+++ b/c++/src/wrap/orc-proto-wrapper.hh
@@ -35,7 +35,6 @@ DIAGNOSTIC_IGNORE("-Wunused-parameter")
DIAGNOSTIC_IGNORE("-Wnested-anon-types")
DIAGNOSTIC_IGNORE("-Wreserved-id-macro")
DIAGNOSTIC_IGNORE("-Wshorten-64-to-32")
-DIAGNOSTIC_IGNORE("-Wsuggest-destructor-override")
DIAGNOSTIC_IGNORE("-Wunknown-warning-option")
DIAGNOSTIC_IGNORE("-Wweak-vtables")
DIAGNOSTIC_IGNORE("-Wzero-as-null-pointer-constant")