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

The following commit has been merged in the master branch:
commit cef63099dce38a1d1aa6c1eea5914444068990dc
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Dec 13 10:27:43 2009 +0000

    Fixed visibility warning on Mac OSX 10.6.2
---
 src/error.cpp |  6 ++++++
 src/error.hpp | 52 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/error.cpp b/src/error.cpp
index b874fe3..6804a0d 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -113,6 +113,12 @@ namespace Exiv2 {
     {
     }
 
+    Error::Error(int code)
+        : code_(code), count_(0)
+    {
+        setMsg();
+    }
+
     Error::~Error() throw()
     {
     }
diff --git a/src/error.hpp b/src/error.hpp
index 21657c8..cb9ac86 100644
--- a/src/error.hpp
+++ b/src/error.hpp
@@ -89,34 +89,16 @@ namespace Exiv2 {
         //! @name Creators
         //@{
         //! Constructor taking only an error code
-        explicit Error(int code)
-            : code_(code), count_(0)
-        {
-            setMsg();
-        }
+        explicit Error(int code);
         //! Constructor taking an error code and one argument
         template<typename A>
-        Error(int code, const A& arg1)
-            : code_(code), count_(1), arg1_(toString(arg1))
-        {
-            setMsg();
-        }
+        EXV_DLLLOCAL Error(int code, const A& arg1);
         //! Constructor taking an error code and two arguments
         template<typename A, typename B>
-        Error(int code, const A& arg1, const B& arg2)
-            : code_(code), count_(2),
-              arg1_(toString(arg1)), arg2_(toString(arg2))
-        {
-            setMsg();
-        }
+        EXV_DLLLOCAL Error(int code, const A& arg1, const B& arg2);
         //! Constructor taking an error code and three arguments
         template<typename A, typename B, typename C>
-        Error(int code, const A& arg1, const B& arg2, const C& arg3)
-            : code_(code), count_(3),
-              arg1_(toString(arg1)), arg2_(toString(arg2)), arg3_(toString(arg3))
-        {
-            setMsg();
-        }
+        EXV_DLLLOCAL Error(int code, const A& arg1, const B& arg2, const C& arg3);
         //! Virtual destructor. (Needed because of throw())
         virtual ~Error() throw();
         //@}
@@ -149,6 +131,32 @@ namespace Exiv2 {
 
     }; // class Error
 
+// *****************************************************************************
+// template and inline definitions
+
+    template<typename A>
+    Error::Error(int code, const A& arg1)
+        : code_(code), count_(1), arg1_(toString(arg1))
+    {
+        setMsg();
+    }
+
+    template<typename A, typename B>
+    Error::Error(int code, const A& arg1, const B& arg2)
+        : code_(code), count_(2),
+          arg1_(toString(arg1)), arg2_(toString(arg2))
+    {
+        setMsg();
+    }
+
+    template<typename A, typename B, typename C>
+    Error::Error(int code, const A& arg1, const B& arg2, const C& arg3)
+        : code_(code), count_(3),
+          arg1_(toString(arg1)), arg2_(toString(arg2)), arg3_(toString(arg3))
+    {
+        setMsg();
+    }
+
 #ifdef _MSC_VER
 # pragma warning( default : 4275 )
 #endif

-- 
exiv2 packaging