[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=0c14d79

The following commit has been merged in the master branch:
commit 0c14d79ad1c6591531145da9d211a13507a5aa3e
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon May 24 01:48:07 2004 +0000

    clone() of concrete a value returns a pointer to the actual type (relaxed return value)
---
 src/value.cpp |  8 ++++----
 src/value.hpp | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/value.cpp b/src/value.cpp
index 0311e4f..1748bcf 100644
--- a/src/value.cpp
+++ b/src/value.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      value.cpp
-  Version:   $Name:  $ $Revision: 1.5 $
+  Version:   $Name:  $ $Revision: 1.6 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   26-Jan-04, ahu: created
              11-Feb-04, ahu: isolated as a component
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.5 $ $RCSfile: value.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.6 $ $RCSfile: value.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -135,7 +135,7 @@ namespace Exiv2 {
         return value_.size();
     }
 
-    Value* DataValue::clone() const
+    DataValue* DataValue::clone() const
     {
         return new DataValue(*this);
     }
@@ -180,7 +180,7 @@ namespace Exiv2 {
         return value_.size();
     }
 
-    Value* AsciiValue::clone() const
+    AsciiValue* AsciiValue::clone() const
     {
         return new AsciiValue(*this);
     }
diff --git a/src/value.hpp b/src/value.hpp
index 9c5b54a..b3ea9a2 100644
--- a/src/value.hpp
+++ b/src/value.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    value.hpp
   @brief   Value interface and concrete subclasses
-  @version $Name:  $ $Revision: 1.8 $
+  @version $Name:  $ $Revision: 1.9 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -243,7 +243,7 @@ namespace Exiv2 {
         virtual long copy(char* buf, ByteOrder byteOrder =invalidByteOrder) const;
         virtual long count() const { return size(); }
         virtual long size() const;
-        virtual Value* clone() const;
+        virtual DataValue* clone() const;
         virtual std::ostream& write(std::ostream& os) const;
         virtual long toLong(long n =0) const { return value_[n]; }
         virtual float toFloat(long n =0) const { return value_[n]; }
@@ -310,7 +310,7 @@ namespace Exiv2 {
         virtual long copy(char* buf, ByteOrder byteOrder =invalidByteOrder) const;
         virtual long count() const { return size(); }
         virtual long size() const;
-        virtual Value* clone() const;
+        virtual AsciiValue* clone() const;
         /*! 
           @brief Write the value to an output stream. Any trailing '\0'
                  characters of the ASCII value are stripped and not written to
@@ -381,7 +381,7 @@ namespace Exiv2 {
         virtual long copy(char* buf, ByteOrder byteOrder) const;
         virtual long count() const { return value_.size(); }
         virtual long size() const;
-        virtual Value* clone() const;
+        virtual ValueType<T>* clone() const;
         virtual std::ostream& write(std::ostream& os) const;
         virtual long toLong(long n =0) const;
         virtual float toFloat(long n =0) const;
@@ -585,7 +585,7 @@ namespace Exiv2 {
     }
 
     template<typename T>
-    Value* ValueType<T>::clone() const
+    ValueType<T>* ValueType<T>::clone() const
     {
         return new ValueType<T>(*this);
     }

-- 
exiv2 packaging