summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-01-08 11:38:14 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-01-08 16:27:32 +0100
commitd122a9d12d970d55f4dc9e4268e0681fd2e6786f (patch)
tree410c113ae65c15051a51e58f3755bb0d803396a1
parentd66ddcffe61d90cb1472e74a040963086032bf9c (diff)
Avoid -Werror,-Wundef
> In file included from C:/lo-clang/core/vcl/skia/salbmp.cxx:20: > In file included from C:/lo-clang/core/vcl/inc\skia/salbmp.hxx:27: > C:/lo-clang/core/workdir/UnpackedTarball/boost\boost/smart_ptr/shared_ptr.hpp(833,5): error: '__GNUC__' is not defined, evaluates to 0 [-Werror,-Wundef] > #if __GNUC__ == 2 && __GNUC_MINOR__ <= 96 > ^ with clang-cl. We already have external/boost/include/boost/shared_ptr.hpp ignoring (among others) -Wundef, but don't have such a wrapper for boost/smart_ptr/shared_ptr.hpp. Change-Id: I448fef581b0870cba821d7bbafcec759dd80dce4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86416 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
-rw-r--r--vcl/inc/skia/salbmp.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index 40cbb62104d1..4550680400d7 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -24,7 +24,7 @@
#include <SkImage.h>
-#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
class VCL_PLUGIN_PUBLIC SkiaSalBitmap final : public SalBitmap
{