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

The following commit has been merged in the master branch:
commit 0e2a19e8bf6e498d336cb7a9e9b50ca948abe53d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Nov 3 16:41:56 2008 +0000

    Prevent g++ warning for the ignored pragma.
---
 src/error.hpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/error.hpp b/src/error.hpp
index 93f80db..89f218d 100644
--- a/src/error.hpp
+++ b/src/error.hpp
@@ -39,10 +39,6 @@
 #include <string>
 #include <iosfwd>
 
-// Disable warnings "non - DLL-interface classkey 'identifier' used as base
-// for DLL-interface classkey 'identifier'"
-#pragma warning( disable : 4275 )
-
 // *****************************************************************************
 // namespace extensions
 namespace Exiv2 {
@@ -50,6 +46,12 @@ namespace Exiv2 {
 // *****************************************************************************
 // class definitions
 
+#ifdef _MSC_VER
+// Disable MSVC warnings "non - DLL-interface classkey 'identifier' used as base
+// for DLL-interface classkey 'identifier'"
+# pragma warning( disable : 4275 )
+#endif
+
     /*!
       @brief Error class interface. Allows the definition and use of a hierarchy
              of error classes which can all be handled in one catch block.
@@ -151,9 +153,9 @@ namespace Exiv2 {
 
     }; // class Error
 
-}                                       // namespace Exiv2
-
-// non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
-#pragma warning( default : 4275 )
+#ifdef _MSC_VER
+# pragma warning( default : 4275 )
+#endif
 
+}                                       // namespace Exiv2
 #endif                                  // #ifndef ERROR_HPP_

-- 
exiv2 packaging