Changeset View
Changeset View
Standalone View
Standalone View
graphics/digikam/files/patch-git_86cd0d1
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
From 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 Mon Sep 17 00:00:00 2001 | |||||
From: Gilles Caulier <caulier.gilles@gmail.com> | |||||
Date: Wed, 18 Jan 2017 10:13:20 +0100 | |||||
Subject: [PATCH] Fix compilation with clang | |||||
--- | |||||
libs/database/imagehistory/imagehistorygraph_boost.h | 4 ++-- | |||||
libs/dimg/filters/greycstoration/greycstorationfilter.cpp | 4 ++-- | |||||
libs/dimg/filters/randomnumbergenerator.cpp | 4 ++-- | |||||
libs/dimg/filters/sharp/matrix.cpp | 4 ++-- | |||||
libs/dmetadata/metaengine_p.cpp | 4 ++-- | |||||
libs/jpegutils/jpegutils.cpp | 4 ++-- | |||||
libs/rawengine/drawdecoder_p.h | 4 ++-- | |||||
7 files changed, 14 insertions(+), 14 deletions(-) | |||||
diff --git a/libs/database/imagehistory/imagehistorygraph_boost.h b/libs/database/imagehistory/imagehistorygraph_boost.h | |||||
index 4ba89c9..d7e6c77 100644 | |||||
--- core/libs/database/imagehistory/imagehistorygraph_boost.h | |||||
+++ core/libs/database/imagehistory/imagehistorygraph_boost.h | |||||
@@ -28,7 +28,7 @@ | |||||
#include "digikam_config.h" | |||||
// Pragma directives to reduce warnings from Boost header files. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" | |||||
#endif | |||||
@@ -1554,7 +1554,7 @@ class Graph | |||||
} // namespace Digikam | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||
diff --git a/libs/dimg/filters/greycstoration/greycstorationfilter.cpp b/libs/dimg/filters/greycstoration/greycstorationfilter.cpp | |||||
index f5d0640..91e443d 100644 | |||||
--- core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp | |||||
+++ core/libs/dimg/filters/greycstoration/greycstorationfilter.cpp | |||||
@@ -52,7 +52,7 @@ | |||||
#define GREYSTORATION_USING_GFACT 1 | |||||
// Pragma directives to reduce warnings from CImg header files. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" | |||||
#pragma GCC diagnostic ignored "-Wunused-but-set-variable" | |||||
@@ -71,7 +71,7 @@ | |||||
#include "cimg/CImg.h" | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||
diff --git a/libs/dimg/filters/randomnumbergenerator.cpp b/libs/dimg/filters/randomnumbergenerator.cpp | |||||
index 93d7cc4..d7b2ed8 100644 | |||||
--- core/libs/dimg/filters/randomnumbergenerator.cpp | |||||
+++ core/libs/dimg/filters/randomnumbergenerator.cpp | |||||
@@ -26,7 +26,7 @@ | |||||
// Boost includes | |||||
// Pragma directives to reduce warnings from Boost header files. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wundef" | |||||
#endif | |||||
@@ -44,7 +44,7 @@ | |||||
#include <boost/random/variate_generator.hpp> | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||
diff --git a/libs/dimg/filters/sharp/matrix.cpp b/libs/dimg/filters/sharp/matrix.cpp | |||||
index 4f32aa3..1a3c65a 100644 | |||||
--- core/libs/dimg/filters/sharp/matrix.cpp | |||||
+++ core/libs/dimg/filters/sharp/matrix.cpp | |||||
@@ -43,7 +43,7 @@ | |||||
// Eigen includes | |||||
// Pragma directives to reduce warnings from Eigen header files. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" | |||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" | |||||
@@ -53,7 +53,7 @@ | |||||
#include <Eigen/LU> | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||
diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp | |||||
index 2c83b58..2b44e06 100644 | |||||
--- core/libs/dmetadata/metaengine_p.cpp | |||||
+++ core/libs/dmetadata/metaengine_p.cpp | |||||
@@ -49,7 +49,7 @@ extern "C" | |||||
#include "digikam_debug.h" | |||||
// Pragma directives to reduce warnings from Exiv2. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" | |||||
#endif | |||||
@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar) | |||||
} // namespace Digikam | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||
diff --git a/libs/jpegutils/jpegutils.cpp b/libs/jpegutils/jpegutils.cpp | |||||
index c823f40..60c7469 100644 | |||||
--- core/libs/jpegutils/jpegutils.cpp | |||||
+++ core/libs/jpegutils/jpegutils.cpp | |||||
@@ -53,7 +53,7 @@ extern "C" | |||||
} | |||||
// Pragma directives to reduce warnings from libjpeg transupp header file. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wunused-parameter" | |||||
#endif | |||||
@@ -69,7 +69,7 @@ extern "C" | |||||
} | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||
diff --git a/libs/rawengine/drawdecoder_p.h b/libs/rawengine/drawdecoder_p.h | |||||
index a27e199..ea653b4 100644 | |||||
--- core/libs/rawengine/drawdecoder_p.h | |||||
+++ core/libs/rawengine/drawdecoder_p.h | |||||
@@ -31,7 +31,7 @@ | |||||
#include <QByteArray> | |||||
// Pragma directives to reduce warnings from LibRaw header files. | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic push | |||||
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" | |||||
#endif | |||||
@@ -46,7 +46,7 @@ | |||||
#include <libraw.h> | |||||
// Restore warnings | |||||
-#if not defined(__APPLE__) && defined(__GNUC__) | |||||
+#if !defined(__APPLE__) && defined(__GNUC__) | |||||
#pragma GCC diagnostic pop | |||||
#endif | |||||