[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=b3c6de6

The following commit has been merged in the master branch:
commit b3c6de6274059d5300b2ec6092662207be45e656
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Aug 19 14:46:28 2016 +0000

    #1210 C++11/regex build-breaker in src/version.cpp.  Thank You to Zulan for reporting this and providing a patch.
---
 src/version.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/version.cpp b/src/version.cpp
index 83af9c1..9e3e81c 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -183,9 +183,10 @@ static bool shouldOutput(const exv_grep_keys_t& greps,const char* key,const std:
     for( exv_grep_keys_t::const_iterator g = greps.begin();
       !bPrint && g != greps.end() ; ++g
     ) {
+        std::string Key(key);
 #if __cplusplus >= CPLUSPLUS11
         std::smatch m;
-        bPrint = std::regex_search(std::string(key),m,*g) || std::regex_search(value,m,*g);
+        bPrint = std::regex_search(Key,m,*g) || std::regex_search(value,m,*g);
 #else
 #if EXV_HAVE_REGEX
         bPrint = (  0 == regexec( &(*g), key          , 0, NULL, 0)
@@ -193,7 +194,6 @@ static bool shouldOutput(const exv_grep_keys_t& greps,const char* key,const std:
                  );
 #else
             std::string Pattern(g->pattern_);
-            std::string Key(key);
             std::string Value(value);
             if ( g->bIgnoreCase_ ) {
                 // https://notfaq.wordpress.com/2007/08/04/cc-convert-string-to-upperlower-case/

-- 
exiv2 packaging