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

The following commit has been merged in the master branch:
commit fafacea8e2bae8c943df0dd7463b2757f964e335
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Dec 27 17:49:48 2010 +0000

    Split constructor into two as a workaround for a MSVC 7.1 bug.
---
 src/value.hpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/value.hpp b/src/value.hpp
index 70edea7..26ac08d 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -1231,7 +1231,10 @@ namespace Exiv2 {
         //! @name Creators
         //@{
         //! Default Constructor.
-        explicit ValueType(TypeId typeId =getType<T>());
+        ValueType();
+        //! Constructor.
+        // The default c'tor and this one can be combined, but that causes MSVC 7.1 to fall on its nose
+        explicit ValueType(TypeId typeId);
         //! Constructor.
         ValueType(const byte* buf, long len, ByteOrder byteOrder, TypeId typeId =getType<T>());
         //! Constructor.
@@ -1482,6 +1485,12 @@ namespace Exiv2 {
     }
 
     template<typename T>
+    ValueType<T>::ValueType()
+        : Value(getType<T>()), pDataArea_(0), sizeDataArea_(0)
+    {
+    }
+
+    template<typename T>
     ValueType<T>::ValueType(TypeId typeId)
         : Value(typeId), pDataArea_(0), sizeDataArea_(0)
     {

-- 
exiv2 packaging