From: malaterre <malaterre>
Date: Mon, 7 Feb 2005 19:17:27 +0000 (+0000)
Subject: ENH: Apparently the new Free .Net compiler complains also about the dll heritance... 
X-Git-Tag: Version1.0.bp~58
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=91dcb54d8a62c9518b914e34475b96c76e5d70ee;p=gdcm.git

ENH: Apparently the new Free .Net compiler complains also about the dll heritance stuff. Adding yet another pragma to please him. STYLE: a best -> a better
---

diff --git a/Testing/TestWriteSimple.cxx b/Testing/TestWriteSimple.cxx
index fe79c983..249c5212 100644
--- a/Testing/TestWriteSimple.cxx
+++ b/Testing/TestWriteSimple.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestWriteSimple.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/07 18:43:38 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/02/07 19:17:27 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -152,7 +152,7 @@ int WriteSimple(Image &img)
                * img.components * img.componentSize / 8;
    unsigned char *imageData = new unsigned char[size];
 
-   // FIXME : find a best heuristic to create the image
+   // FIXME : find a better heuristic to create the image
    unsigned char *tmp = imageData;
    for(int k=0;k<img.sizeZ;k++)
    {
diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index b4eb0d96..094ad90c 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/06 14:31:09 $
-  Version:   $Revision: 1.60 $
+  Date:      $Date: 2005/02/07 19:17:27 $
+  Version:   $Revision: 1.61 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,6 +27,8 @@
 // 'identifier' : class 'type' needs to have dll-interface to be used by
 // clients of class 'type2'
 #pragma warning ( disable : 4251 )
+// non dll-interface class 'type' used as base for dll-interface class 'type2'
+#pragma warning ( disable : 4275 )
 // 'identifier' : identifier was truncated to 'number' characters in the
 // debug information
 #pragma warning ( disable : 4786 )