[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:15 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=611d571
The following commit has been merged in the master branch:
commit 611d5711c5c7fb5da286ba0e6a714517e7128180
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Mon Apr 12 10:35:17 2010 +0000
remove MSVC pragma warnings under mingw
---
xmpsdk/src/ExpatAdapter.cpp | 4 +++-
xmpsdk/src/ParseRDF.cpp | 6 ++++--
xmpsdk/src/WXMPIterator.cpp | 14 ++++++++------
xmpsdk/src/WXMPMeta.cpp | 16 +++++++++-------
xmpsdk/src/WXMPUtils.cpp | 14 ++++++++------
xmpsdk/src/XMPCore_Impl.cpp | 6 ++++--
xmpsdk/src/XMPCore_Impl.hpp | 6 ++++--
xmpsdk/src/XMPIterator.cpp | 8 +++++---
xmpsdk/src/XMPMeta-GetSet.cpp | 8 +++++---
xmpsdk/src/XMPMeta-Parse.cpp | 2 ++
xmpsdk/src/XMPMeta-Serialize.cpp | 3 ++-
xmpsdk/src/XMPMeta.cpp | 2 ++
xmpsdk/src/XMPUtils-FileInfo.cpp | 2 ++
xmpsdk/src/XMPUtils.cpp | 2 ++
14 files changed, 60 insertions(+), 33 deletions(-)
diff --git a/xmpsdk/src/ExpatAdapter.cpp b/xmpsdk/src/ExpatAdapter.cpp
index 3dff828..0cbb0ff 100644
--- a/xmpsdk/src/ExpatAdapter.cpp
+++ b/xmpsdk/src/ExpatAdapter.cpp
@@ -19,7 +19,9 @@
using namespace std;
#if XMP_WinBuild
- #pragma warning ( disable : 4996 ) // '...' was declared deprecated
+# ifdef _MSV_VER
+ #pragma warning ( disable : 4996 ) // '...' was declared deprecated
+# endif
#endif
// *** Set memory handlers.
diff --git a/xmpsdk/src/ParseRDF.cpp b/xmpsdk/src/ParseRDF.cpp
index 330080a..b220a52 100644
--- a/xmpsdk/src/ParseRDF.cpp
+++ b/xmpsdk/src/ParseRDF.cpp
@@ -19,8 +19,10 @@
using namespace std;
#if XMP_WinBuild
- #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
- #pragma warning ( disable : 4505 ) // unreferenced local function has been removed
+# ifdef _MSV_VER
+ #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+ #pragma warning ( disable : 4505 ) // unreferenced local function has been removed
+# endif
#endif
// =================================================================================================
diff --git a/xmpsdk/src/WXMPIterator.cpp b/xmpsdk/src/WXMPIterator.cpp
index b52fa0d..a42cc03 100644
--- a/xmpsdk/src/WXMPIterator.cpp
+++ b/xmpsdk/src/WXMPIterator.cpp
@@ -13,12 +13,14 @@
#include "client-glue/WXMPIterator.hpp"
#if XMP_WinBuild
- #pragma warning ( disable : 4101 ) // unreferenced local variable
- #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
- #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
- #if XMP_DebugBuild
- #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
- #endif
+# ifdef _MSV_VER
+ #pragma warning ( disable : 4101 ) // unreferenced local variable
+ #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+ #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #if XMP_DebugBuild
+ #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+# endif
+# endif
#endif
#if __cplusplus
diff --git a/xmpsdk/src/WXMPMeta.cpp b/xmpsdk/src/WXMPMeta.cpp
index 4c95c5d..3507b0d 100644
--- a/xmpsdk/src/WXMPMeta.cpp
+++ b/xmpsdk/src/WXMPMeta.cpp
@@ -13,13 +13,15 @@
#include "client-glue/WXMPMeta.hpp"
#if XMP_WinBuild
- #pragma warning ( disable : 4101 ) // unreferenced local variable
- #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
- #pragma warning ( disable : 4702 ) // unreachable code
- #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
- #if XMP_DebugBuild
- #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
- #endif
+ #ifdef _MSV_VER
+ #pragma warning ( disable : 4101 ) // unreferenced local variable
+ #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+ #pragma warning ( disable : 4702 ) // unreachable code
+ #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #if XMP_DebugBuild
+ #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+ #endif
+ #endif
#endif
#if __cplusplus
diff --git a/xmpsdk/src/WXMPUtils.cpp b/xmpsdk/src/WXMPUtils.cpp
index dac093a..ec5372d 100644
--- a/xmpsdk/src/WXMPUtils.cpp
+++ b/xmpsdk/src/WXMPUtils.cpp
@@ -15,12 +15,14 @@
#include "client-glue/WXMPUtils.hpp"
#if XMP_WinBuild
- #pragma warning ( disable : 4101 ) // unreferenced local variable
- #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
- #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
- #if XMP_DebugBuild
- #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
- #endif
+ #ifdef _MSV_VER
+ #pragma warning ( disable : 4101 ) // unreferenced local variable
+ #pragma warning ( disable : 4189 ) // local variable is initialized but not referenced
+ #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #if XMP_DebugBuild
+ #pragma warning ( disable : 4297 ) // function assumed not to throw an exception but does
+ #endif
+ #endif
#endif
#if __cplusplus
diff --git a/xmpsdk/src/XMPCore_Impl.cpp b/xmpsdk/src/XMPCore_Impl.cpp
index 4f7152a..24ff225 100644
--- a/xmpsdk/src/XMPCore_Impl.cpp
+++ b/xmpsdk/src/XMPCore_Impl.cpp
@@ -18,8 +18,10 @@
using namespace std;
#if XMP_WinBuild
- #pragma warning ( disable : 4290 ) // C++ exception specification ignored except ... not __declspec(nothrow)
- #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #ifdef _MSV_VER
+ #pragma warning ( disable : 4290 ) // C++ exception specification ignored except ... not __declspec(nothrow)
+ #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #endif
#endif
// *** Add debug codegen checks, e.g. that typical masking operations really work
diff --git a/xmpsdk/src/XMPCore_Impl.hpp b/xmpsdk/src/XMPCore_Impl.hpp
index b3a8e6b..691c8d6 100644
--- a/xmpsdk/src/XMPCore_Impl.hpp
+++ b/xmpsdk/src/XMPCore_Impl.hpp
@@ -30,8 +30,10 @@
#endif
#if XMP_WinBuild
- #pragma warning ( disable : 4244 ) // possible loss of data (temporary for 64 bit builds)
- #pragma warning ( disable : 4267 ) // possible loss of data (temporary for 64 bit builds)
+# ifdef _MSV_VER
+ #pragma warning ( disable : 4244 ) // possible loss of data (temporary for 64 bit builds)
+ #pragma warning ( disable : 4267 ) // possible loss of data (temporary for 64 bit builds)
+# endif
#endif
// =================================================================================================
diff --git a/xmpsdk/src/XMPIterator.cpp b/xmpsdk/src/XMPIterator.cpp
index 3054af4..1815d37 100644
--- a/xmpsdk/src/XMPIterator.cpp
+++ b/xmpsdk/src/XMPIterator.cpp
@@ -15,9 +15,11 @@
#include <stdio.h> // For snprintf.
#if XMP_WinBuild
- #pragma warning ( disable : 4702 ) // unreachable code
- #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
- #pragma warning ( disable : 4996 ) // '...' was declared deprecated
+ #ifdef _MSV_VER
+ #pragma warning ( disable : 4702 ) // unreachable code
+ #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #pragma warning ( disable : 4996 ) // '...' was declared deprecated
+ #endif
#endif
// =================================================================================================
diff --git a/xmpsdk/src/XMPMeta-GetSet.cpp b/xmpsdk/src/XMPMeta-GetSet.cpp
index 41b01d5..f4a4d05 100644
--- a/xmpsdk/src/XMPMeta-GetSet.cpp
+++ b/xmpsdk/src/XMPMeta-GetSet.cpp
@@ -28,9 +28,11 @@
using namespace std;
#if XMP_WinBuild
- #pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...'
- #pragma warning ( disable : 4702 ) // unreachable code
- #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #ifdef _MSV_VER
+ #pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...'
+ #pragma warning ( disable : 4702 ) // unreachable code
+ #pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
+ #endif
#endif
diff --git a/xmpsdk/src/XMPMeta-Parse.cpp b/xmpsdk/src/XMPMeta-Parse.cpp
index 249a855..5429eac 100644
--- a/xmpsdk/src/XMPMeta-Parse.cpp
+++ b/xmpsdk/src/XMPMeta-Parse.cpp
@@ -26,11 +26,13 @@
using namespace std;
#if XMP_WinBuild
+#ifdef _MSV_VER
#pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...'
#pragma warning ( disable : 4702 ) // unreachable code
#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
#pragma warning ( disable : 4996 ) // '...' was declared deprecated
#endif
+#endif
// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
diff --git a/xmpsdk/src/XMPMeta-Serialize.cpp b/xmpsdk/src/XMPMeta-Serialize.cpp
index 00d3200..e2da167 100644
--- a/xmpsdk/src/XMPMeta-Serialize.cpp
+++ b/xmpsdk/src/XMPMeta-Serialize.cpp
@@ -25,11 +25,12 @@
using namespace std;
#if XMP_WinBuild
+#ifdef _MSV_VER
#pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...'
#pragma warning ( disable : 4702 ) // unreachable code
#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
#endif
-
+#endif
// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
// *** Add debug codegen checks, e.g. that typical masking operations really work
diff --git a/xmpsdk/src/XMPMeta.cpp b/xmpsdk/src/XMPMeta.cpp
index 8eb71a4..b255563 100644
--- a/xmpsdk/src/XMPMeta.cpp
+++ b/xmpsdk/src/XMPMeta.cpp
@@ -30,11 +30,13 @@
using namespace std;
#if XMP_WinBuild
+#ifdef _MSV_VER
#pragma warning ( disable : 4533 ) // initialization of '...' is skipped by 'goto ...'
#pragma warning ( disable : 4702 ) // unreachable code
#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
#pragma warning ( disable : 4996 ) // '...' was declared deprecated
#endif
+#endif
// *** Use the XMP_PropIsXyz (Schema, Simple, Struct, Array, ...) macros
diff --git a/xmpsdk/src/XMPUtils-FileInfo.cpp b/xmpsdk/src/XMPUtils-FileInfo.cpp
index ebfb9a5..80c60a5 100644
--- a/xmpsdk/src/XMPUtils-FileInfo.cpp
+++ b/xmpsdk/src/XMPUtils-FileInfo.cpp
@@ -20,8 +20,10 @@
#include <stdio.h> // For snprintf.
#if XMP_WinBuild
+#ifdef _MSV_VER
#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
#endif
+#endif
// =================================================================================================
// Local Types and Constants
diff --git a/xmpsdk/src/XMPUtils.cpp b/xmpsdk/src/XMPUtils.cpp
index 5aa13da..a0f4f02 100644
--- a/xmpsdk/src/XMPUtils.cpp
+++ b/xmpsdk/src/XMPUtils.cpp
@@ -24,9 +24,11 @@
#include <stdio.h> // For snprintf.
#if XMP_WinBuild
+#ifdef _MSV_VER
#pragma warning ( disable : 4800 ) // forcing value to bool 'true' or 'false' (performance warning)
#pragma warning ( disable : 4996 ) // '...' was declared deprecated
#endif
+#endif
// =================================================================================================
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list