[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5282bc2

The following commit has been merged in the master branch:
commit 5282bc212087d483a9d51c272ce27dc349125cdd
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Oct 5 12:10:06 2016 +0000

    #1230 More changes to pacify MinGW (the nightmare environment).
---
 include/exiv2/version.hpp | 1 -
 src/convert.cpp           | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/exiv2/version.hpp b/include/exiv2/version.hpp
index ff93d7b..bfb311f 100644
--- a/include/exiv2/version.hpp
+++ b/include/exiv2/version.hpp
@@ -35,7 +35,6 @@
 // *****************************************************************************
 // included header files
 // + standard includes
-#include <string>
 #include <vector>
 
 #define CPLUSPLUS11 201103L
diff --git a/src/convert.cpp b/src/convert.cpp
index 72ac861..cf477d6 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -1359,6 +1359,7 @@ namespace Exiv2 {
 # endif
 #endif
         return ret;
+        UNUSED(str);
     }
 }                                       // namespace Exiv2
 

-- 
exiv2 packaging