Blame 0002-Fix-compilation-with-clang.patch
|
Rex Dieter |
7cc5ffe |
From 86cd0d1d89c8b4d13f06dc8a353bdd99f13c4758 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
7cc5ffe |
From: Gilles Caulier <caulier.gilles@gmail.com>
|
|
Rex Dieter |
7cc5ffe |
Date: Wed, 18 Jan 2017 10:13:20 +0100
|
|
Rex Dieter |
7cc5ffe |
Subject: [PATCH 2/2] Fix compilation with clang
|
|
Rex Dieter |
7cc5ffe |
|
|
Rex Dieter |
7cc5ffe |
---
|
|
Rex Dieter |
7cc5ffe |
libs/dmetadata/metaengine_p.cpp | 4 ++--
|
|
Rex Dieter |
7cc5ffe |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
Rex Dieter |
7cc5ffe |
|
|
Rex Dieter |
7cc5ffe |
diff --git a/libs/dmetadata/metaengine_p.cpp b/libs/dmetadata/metaengine_p.cpp
|
|
Rex Dieter |
7cc5ffe |
index 2c83b58..2b44e06 100644
|
|
Rex Dieter |
7cc5ffe |
--- a/libs/dmetadata/metaengine_p.cpp
|
|
Rex Dieter |
7cc5ffe |
+++ b/libs/dmetadata/metaengine_p.cpp
|
|
Rex Dieter |
7cc5ffe |
@@ -49,7 +49,7 @@ extern "C"
|
|
Rex Dieter |
7cc5ffe |
#include "digikam_debug.h"
|
|
Rex Dieter |
7cc5ffe |
|
|
Rex Dieter |
7cc5ffe |
// Pragma directives to reduce warnings from Exiv2.
|
|
Rex Dieter |
7cc5ffe |
-#if not defined(__APPLE__) && defined(__GNUC__)
|
|
Rex Dieter |
7cc5ffe |
+#if !defined(__APPLE__) && defined(__GNUC__)
|
|
Rex Dieter |
7cc5ffe |
#pragma GCC diagnostic push
|
|
Rex Dieter |
7cc5ffe |
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
|
|
Rex Dieter |
7cc5ffe |
#endif
|
|
Rex Dieter |
7cc5ffe |
@@ -723,7 +723,7 @@ void MetaEngine::Private::loadSidecarData(Exiv2::Image::AutoPtr xmpsidecar)
|
|
Rex Dieter |
7cc5ffe |
} // namespace Digikam
|
|
Rex Dieter |
7cc5ffe |
|
|
Rex Dieter |
7cc5ffe |
// Restore warnings
|
|
Rex Dieter |
7cc5ffe |
-#if not defined(__APPLE__) && defined(__GNUC__)
|
|
Rex Dieter |
7cc5ffe |
+#if !defined(__APPLE__) && defined(__GNUC__)
|
|
Rex Dieter |
7cc5ffe |
#pragma GCC diagnostic pop
|
|
Rex Dieter |
7cc5ffe |
#endif
|
|
Rex Dieter |
7cc5ffe |
|
|
Rex Dieter |
7cc5ffe |
--
|
|
Rex Dieter |
7cc5ffe |
2.9.3
|
|
Rex Dieter |
7cc5ffe |
|