external/gpgmepp/Library_gpgmepp.mk | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 7d97827e5bfd080f884d900c4018d0d826316ce5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 27 15:26:47 2017 +0100
Silence clang-cl -Werror,-Wc++11-narrowing in external/gpgmepp
>
workdir/UnpackedTarball/gpgmepp/lang/cpp/src/gpgadduserideditinteractor.cpp(105,10):
error: case value evaluates to -1, which cannot be narrowed to type 'unsigned
int' [-Wc++11-narrowing]
> case ERROR:
> ^
>
workdir/UnpackedTarball/gpgmepp/lang/cpp/src/gpgadduserideditinteractor.cpp(182,10):
error: case value evaluates to -1, which cannot be narrowed to type 'unsigned
int' [-Wc++11-narrowing]
> case ERROR:
> ^
where ERROR is defined in gpgadduserideditinteractor.cpp as
> enum {
> START = EditInteractor::StartState,
> COMMAND,
> NAME,
> EMAIL,
> COMMENT,
> QUIT,
> SAVE,
>
> ERROR = EditInteractor::ErrorState
> };
and ErrorState is defined in editinteractor.h as
> enum {
> StartState = 0,
> ErrorState = 0xFFFFFFFF
> };
but ERROR is nevertheless signed according to MSVC's broken enum rules.
Change-Id: Ie85361a681ef02dc9705b565ca892d9a4c705afa
Reviewed-on: https://gerrit.libreoffice.org/45346
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/gpgmepp/Library_gpgmepp.mk
b/external/gpgmepp/Library_gpgmepp.mk
index 7649753fe748..8a69e954bf31 100644
--- a/external/gpgmepp/Library_gpgmepp.mk
+++ b/external/gpgmepp/Library_gpgmepp.mk
@@ -76,4 +76,12 @@ $(eval $(call
gb_Library_add_generated_exception_objects,gpgmepp,\
UnpackedTarball/gpgmepp/lang/cpp/src/vfsmountresult \
))
+ifeq ($(COM),MSC)
+ifeq ($(COM_IS_CLANG),TRUE)
+$(eval $(call gb_Library_add_cxxflags,gpgmepp, \
+ -Wno-c++11-narrowing \
+))
+endif
+endif
+
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
