summaryrefslogtreecommitdiff
path: root/external/libcmis
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-12-06 18:48:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-07 07:46:20 +0100
commit665ac8f32d3aaaf7c27e8976e14fd4819edbf79b (patch)
tree282105d767a99cc945e4808ca5696918fcbea9a9 /external/libcmis
parentf3e258e343dd6e3ca39fc8cb710ed6c4cbb530ba (diff)
All supported versions of Clang and GCC support at least C++17 now
Change-Id: I9130d0d1fceeb6efb1f324c99acd38eb92e67850 Reviewed-on: https://gerrit.libreoffice.org/64733 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libcmis')
-rw-r--r--external/libcmis/StaticLibrary_libcmis.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/external/libcmis/StaticLibrary_libcmis.mk b/external/libcmis/StaticLibrary_libcmis.mk
index 6e666f489c7a..2998ec24d2fb 100644
--- a/external/libcmis/StaticLibrary_libcmis.mk
+++ b/external/libcmis/StaticLibrary_libcmis.mk
@@ -13,13 +13,10 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,libcmis))
ifeq ($(COM_IS_CLANG),TRUE)
# Avoid narrowing conversion error (even though the option is technically a warning)
-# caused by boost.
-# Also avoid -Wdynamic-exception-spec errors in C++17 mode.
+# caused by boost, and avoid -Wdynamic-exception-spec errors.
$(eval $(call gb_StaticLibrary_add_cxxflags,libcmis,\
-Wno-error=c++11-narrowing \
- $(if $(filter -std=gnu++2a -std=c++2a -std=gnu++17 -std=gnu++1z -std=c++17 -std=c++1z, \
- $(CXXFLAGS_CXX11)), \
- -Wno-error=dynamic-exception-spec) \
+ -Wno-error=dynamic-exception-spec \
))
endif