Skip to content

Commit b27a018

Browse files
authored
Revert "Enable deprecation warnings (#2036)"
This reverts commit 4e82005.
1 parent 6e8147a commit b27a018

5 files changed

Lines changed: 18 additions & 3 deletions

File tree

.github/workflows/build.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,11 @@ jobs:
100100
# Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
101101
run: |
102102
echo "DISTCHECK_CONFIGURE_FLAGS=${{ matrix.configure-args }}" >> $GITHUB_ENV
103+
- name: Set additional Linux configure arguments
104+
if: runner.os == 'Linux'
105+
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
106+
run: |
107+
echo "DISTCHECK_CONFIGURE_FLAGS=$DISTCHECK_CONFIGURE_FLAGS CPPFLAGS=-Wno-deprecated-declarations" >> $GITHUB_ENV
103108
- name: Print configure command
104109
run: echo "./configure $DISTCHECK_CONFIGURE_FLAGS"
105110
- name: Configure

.travis-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ else
294294
# Env var name DISTCHECK_CONFIGURE_FLAGS must be used, see #1881 and #1883
295295
if [[ "$TRAVIS_OS_NAME" = "linux" ]]; then
296296
# Silence all deprecated declarations on Linux due to auto_ptr making the build log too long
297-
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133'
297+
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133 CPPFLAGS=-Wno-deprecated-declarations'
298298
else
299299
export DISTCHECK_CONFIGURE_FLAGS='--enable-rdm-tests --enable-java-libs --enable-ja-rule --enable-e133'
300300
fi

Makefile.am

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,19 @@ if ! USING_WIN32
6565
if FATAL_WARNINGS
6666
COMMON_CXXFLAGS += -Werror
6767
COMMON_PROTOBUF_CXXFLAGS += -Werror -Wno-error=unused-parameter \
68+
-Wno-error=deprecated-declarations \
6869
-Wno-error=sign-compare \
6970
-Wno-error=ignored-qualifiers
7071
COMMON_TESTING_FLAGS += -Werror
71-
COMMON_TESTING_PROTOBUF_FLAGS += -Werror -Wno-error=unused-parameter
72+
COMMON_TESTING_PROTOBUF_FLAGS += -Werror -Wno-error=unused-parameter \
73+
-Wno-error=deprecated-declarations
74+
75+
if GNU_PLUS_PLUS_11_DEPRECATIONS
76+
# We have to use gnu++11 for some reason, so stop it complaining about
77+
# auto_ptr
78+
COMMON_CXXFLAGS += -Wno-error=deprecated-declarations
79+
COMMON_TESTING_FLAGS += -Wno-error=deprecated-declarations
80+
endif
7281
endif
7382
endif
7483

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ AS_IF([test "x$ac_cv_gnu_plus_plus_11" = xyes],
143143
])
144144
AS_IF([test "x$require_gnu_plus_plus_11" = xyes],
145145
[CXXFLAGS="$CXXFLAGS -std=gnu++11"])
146+
AM_CONDITIONAL([GNU_PLUS_PLUS_11_DEPRECATIONS], [test "x$require_gnu_plus_plus_11" = xyes])
146147

147148
# Checks for header files.
148149
AC_HEADER_DIRENT

debian/rules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export VERBOSE=1
1414
dh $@ --parallel --with bash_completion,python3
1515

1616
override_dh_auto_configure:
17-
dh_auto_configure -- --enable-python-libs --enable-rdm-tests CXXFLAGS='-Wno-error=unused-parameter' pythondir='/usr/lib/python3/dist-packages'
17+
dh_auto_configure -- --enable-python-libs --enable-rdm-tests CXXFLAGS='-Wno-error=deprecated-declarations -Wno-error=unused-parameter' pythondir='/usr/lib/python3/dist-packages'
1818

1919
override_dh_installinit:
2020
dh_installinit -p ola --name=olad

0 commit comments

Comments
 (0)