[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=5b9541b

The following commit has been merged in the master branch:
commit 5b9541bc9342fd22dc30c4b8902243866ea5c70b
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Feb 15 04:46:24 2004 +0000

    Moved getType() template from types to value
---
 src/types.hpp | 21 +--------------------
 src/value.hpp | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/types.hpp b/src/types.hpp
index 1b488f0..2b5cfb8 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    types.hpp
   @brief   Type definitions for Exiv2 and related functionality
-  @version $Name:  $ $Revision: 1.2 $
+  @version $Name:  $ $Revision: 1.3 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -167,25 +167,6 @@ namespace Exif {
 // *****************************************************************************
 // template and inline definitions
 
-    //! Template to determine the TypeId for a type T
-    template<typename T> TypeId getType();
-
-    //! Specialization for an unsigned short
-    template<> inline TypeId getType<uint16>() { return unsignedShort; }
-    //! Specialization for an unsigned long
-    template<> inline TypeId getType<uint32>() { return unsignedLong; }
-    //! Specialization for an unsigned rational
-    template<> inline TypeId getType<URational>() { return unsignedRational; }
-    //! Specialization for a signed short
-    template<> inline TypeId getType<int16>() { return signedShort; }
-    //! Specialization for a signed long
-    template<> inline TypeId getType<int32>() { return signedLong; }
-    //! Specialization for a signed rational
-    template<> inline TypeId getType<Rational>() { return signedRational; }
-
-    // No default implementation: let the compiler/linker complain
-//    template<typename T> inline TypeId getType() { return invalid; }
-
     //! Utility function to convert the argument of any type to a string
     template<typename T> 
     std::string toString(T arg)
diff --git a/src/value.hpp b/src/value.hpp
index 18711f7..e05059a 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.2 $
+  @version $Name:  $ $Revision: 1.3 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @date    09-Jan-04, ahu: created
@@ -257,6 +257,25 @@ namespace Exif {
 
     }; // class AsciiValue
 
+    //! Template to determine the TypeId for a type T
+    template<typename T> TypeId getType();
+
+    //! Specialization for an unsigned short
+    template<> inline TypeId getType<uint16>() { return unsignedShort; }
+    //! Specialization for an unsigned long
+    template<> inline TypeId getType<uint32>() { return unsignedLong; }
+    //! Specialization for an unsigned rational
+    template<> inline TypeId getType<URational>() { return unsignedRational; }
+    //! Specialization for a signed short
+    template<> inline TypeId getType<int16>() { return signedShort; }
+    //! Specialization for a signed long
+    template<> inline TypeId getType<int32>() { return signedLong; }
+    //! Specialization for a signed rational
+    template<> inline TypeId getType<Rational>() { return signedRational; }
+
+    // No default implementation: let the compiler/linker complain
+//    template<typename T> inline TypeId getType() { return invalid; }
+
     /*!
       @brief Template for a %Value of a basic type. This is used for unsigned 
              and signed short, long and rationals.

-- 
exiv2 packaging