src/*.cxx removed pragma thingies to src/gdcmCommon.h

Two reasons: - clear things
             - third parties access gdcm through header files, so won't
             suffer anymore VC++ complains

diff --git a/ChangeLog b/ChangeLog
index f845d0252b8582d70b64dae506c9252250fc7971..e0734ce2f38bdfe5296827ac9e131388f31dc3a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-02  Mathieu Malaterre  <Mathieu.Malaterre@creatis.insa-lyon.fr>
+      * src/*.cxx removed pragma thingies to src/gdcmCommon.h
+        Two reasons: - clear things
+                     - third parties acces gdcm through header files, so won't
+                     suffer anymore VC++ complains
+
 2003-09-22  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * src/gdcmUtil.[cxx|h] : change the _CreateCleanString return value from
         char* to std::string. Thus, the use of strdup becoomes useless. (see

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index b3300d9063abd0d39d4ca12ca44b73ba15e2b34f..cc80d9e9e7cf87a04170d965ab7e74f1d733116c 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,6 +3,18 @@
 #ifndef GDCMCOMMON_H
 #define GDCMCOMMON_H
 
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+//'identifier' : decorated name length exceeded, name was truncated
+#pragma warning ( disable : 4503 )
+#endif //_MSC_VER
+
 #ifdef __GNUC__
 #include <stdint.h>
 #define guint16 uint16_t

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index ad8945f586311372f9e058163c040ac04e12329b..3acd3fc310fe3db56d154c6508c14b96024ade12 100644 (file)
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,18 +1,8 @@
 // gdcmDict.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
-#include <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
+#include <fstream>
 
 /**
  * \ingroup gdcmDict

diff --git a/src/gdcmDict.h b/src/gdcmDict.h
index 37d0076e3caf192b0b103df295dafc79f6f53c06..db6f0e04bc94e252859b38ad57f8c23ecbf2a8b9 100644 (file)
--- a/src/gdcmDict.h
+++ b/src/gdcmDict.h
@@ -3,9 +3,9 @@
 #ifndef GDCMDICT_H
 #define GDCMDICT_H
 
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmDictEntry.h"
+#include <map>
 
 typedef std::map<TagKey,  gdcmDictEntry*> TagKeyHT;
 typedef std::map<TagName, gdcmDictEntry*> TagNameHT;

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index 1e135cb65dae7045e178320209bfad79d0e3628b..763dc3b0ba32e972ae1e58d62817430f77b2ec6c 100644 (file)
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,17 +1,8 @@
 // gdcmDictEntry.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+#include "gdcmDictEntry.h"
 
 #include <stdio.h>    // FIXME For sprintf
-#include "gdcmDictEntry.h"
 #include "gdcmUtil.h"
 
 

diff --git a/src/gdcmDictSet.cxx b/src/gdcmDictSet.cxx
index 3306b73d3ea6a1da0f4adf462fd60fabc5382bcd..99b890200da1d523d2590459992389715e78b44b 100644 (file)
--- a/src/gdcmDictSet.cxx
+++ b/src/gdcmDictSet.cxx
@@ -1,20 +1,9 @@
 // gdcmDictEntry
 
-#ifdef _MSC_VER
-//'identifier' : decorated name length exceeded, name was truncated
-//#pragma warning ( disable : 4503 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
+#include "gdcmDictSet.h"
+#include "gdcmUtil.h"
 #include <fstream>
 #include <stdlib.h>  // For getenv
-#include "gdcmUtil.h"
-#include "gdcmDictSet.h"
 
 #define PUB_DICT_NAME     "DicomV3Dict"
 #ifndef PUB_DICT_PATH

diff --git a/src/gdcmDictSet.h b/src/gdcmDictSet.h
index f71a1eb8d447aaa977d1a23dcaafa13528b1d34b..4256ad8e3fc29defb1f33f0b6338ef1c05a3a42e 100644 (file)
--- a/src/gdcmDictSet.h
+++ b/src/gdcmDictSet.h
@@ -3,9 +3,9 @@
 #ifndef GDCMDICTSET_H
 #define GDCMDICTSET_H
 
+#include "gdcmDict.h"
 #include <map>
 #include <list>
-#include "gdcmDict.h"
 
 typedef std::string DictKey;
 typedef std::map<DictKey, gdcmDict*> DictSetHT;

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index 7f8773882786efbcfbe381dbbe500408a6569d5c..a2781df6249b882a6e15610bb07a321f66b37cf5 100644 (file)
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -1,18 +1,9 @@
 // gdcmElValSet.cxx
 
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
-#include <sstream>
 #include "gdcmUtil.h"
 #include "gdcmElValSet.h"
 #include "gdcmTS.h"
+#include <sstream>
 
 gdcmElValSet::~gdcmElValSet() {
    for (TagElValueHT::iterator tag = tagHt.begin(); tag != tagHt.end(); ++tag) {

diff --git a/src/gdcmElValSet.h b/src/gdcmElValSet.h
index 08490cfd7ae8954b5de44d6ee3c77d0c88e43ac2..fe97e3c8e12fd394de43db1686bc5fb46742abac 100644 (file)
--- a/src/gdcmElValSet.h
+++ b/src/gdcmElValSet.h
@@ -1,13 +1,14 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.16 2003/07/23 08:43:03 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmElValSet.h,v 1.17 2003/10/02 11:26:15 malaterre Exp $
 
 #ifndef GDCMELVALSET_H
 #define GDCMELVALSET_H
 
-#include <stdio.h>    // FIXME For FILE on GCC only
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmElValue.h"
 
+#include <stdio.h>    // FIXME For FILE on GCC only
+#include <map>
+
 ////////////////////////////////////////////////////////////////////////////
 // Container for a set of successfully parsed ElValues.
 

diff --git a/src/gdcmException.cxx b/src/gdcmException.cxx
index ef908db918687a1534b1d7e44591afa8c3092890..d2d3d7cd030221b5c11ba898d5998cff8c5080eb 100644 (file)
--- a/src/gdcmException.cxx
+++ b/src/gdcmException.cxx
@@ -1,13 +1,3 @@
-#ifdef _MSC_VER
-//'identifier' : not all control paths return a value
-//#pragma warning ( disable : 4715 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
 
 #include "gdcmException.h"
 

diff --git a/src/gdcmException.h b/src/gdcmException.h
index 03d74fb996c98465bf357d8a275d0a1f32992ac1..fee65d6c748e4a61bfe068c4769cb3f3fd75f789 100644 (file)
--- a/src/gdcmException.h
+++ b/src/gdcmException.h
@@ -1,10 +1,10 @@
 #ifndef GDCM_EXCEPTION_H
 #define GDCM_EXCEPTION_H
 
+#include "gdcmCommon.h"
 #include <string>
 #include <iostream>
 #include <exception>
-#include "gdcmCommon.h"
 
 /**
  * Any exception thrown in the gdcm library

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 475ec04ecf74c3cc5b659bed0568a20687cb2f52..678a54940d0a676ab8676f3cb5ca6eafe2d651ab 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -1,17 +1,5 @@
 // gdcmFile.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'type' : forcing value to bool 'true' or 'false' (performance warning)
-//#pragma warning ( disable : 4800 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
 #include "gdcmFile.h"
 #include "gdcmUtil.h"
 #include "iddcmjpeg.h" // for the 'LibIDO' Jpeg LossLess

diff --git a/src/gdcmHeader.cxx b/src/gdcmHeader.cxx
index 1dc78fa72d69dd4ce9af323d73fb0a79e350af7e..7a6c7bd44ee3e6afeb9194945469f2aaf7d2e38e 100644 (file)
--- a/src/gdcmHeader.cxx
+++ b/src/gdcmHeader.cxx
@@ -1,16 +1,6 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.91 2003/09/24 16:46:38 jpr Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.cxx,v 1.92 2003/10/02 11:26:15 malaterre Exp $
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-//'identifier' : not all control paths return a value
-//#pragma warning ( disable : 4715 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+#include "gdcmHeader.h"
 
 #include <stdio.h>
 #include <cerrno>
@@ -23,7 +13,6 @@
 #include <cctype>    // for isalpha
 #include <sstream>
 #include "gdcmUtil.h"
-#include "gdcmHeader.h"
 #include "gdcmTS.h"
 
 // Refer to gdcmHeader::CheckSwap()

diff --git a/src/gdcmHeader.h b/src/gdcmHeader.h
index a5a21fb02bbee728dbccf89225dcdd44c60fb342..e377f90a179728086ba46591c7af8ad6701e1142 100644 (file)
--- a/src/gdcmHeader.h
+++ b/src/gdcmHeader.h
@@ -1,9 +1,8 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.38 2003/09/18 09:32:15 regrain Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeader.h,v 1.39 2003/10/02 11:26:16 malaterre Exp $
 
 #ifndef GDCMHEADER_H
 #define GDCMHEADER_H
 
-#include <map>
 #include "gdcmCommon.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
@@ -11,6 +10,7 @@
 #include "gdcmDictSet.h"
 #include "gdcmElValue.h"
 #include "gdcmElValSet.h"
+#include <map>
 
 typedef std::string VRKey;
 typedef std::string VRAtr;

diff --git a/src/gdcmHeaderHelper.cxx b/src/gdcmHeaderHelper.cxx
index 02690541380fc2a364efcdff2e787622dfdff290..3508803987222a9318487e0c66f4afdca3d9a26f 100644 (file)
--- a/src/gdcmHeaderHelper.cxx
+++ b/src/gdcmHeaderHelper.cxx
@@ -1,17 +1,7 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.cxx,v 1.8 2003/09/24 16:46:38 jpr Exp $
-
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-#pragma warning ( disable : 4800 )
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.cxx,v 1.9 2003/10/02 11:26:16 malaterre Exp $
 
 #include "gdcmHeaderHelper.h"
+
 #include "gdcmUtil.h" //for debug
 #include <math.h>
 #include <algorithm>

diff --git a/src/gdcmHeaderIdo.cxx b/src/gdcmHeaderIdo.cxx
index 4c75ba7873a96db1592e6b9c34635e832c79c8ff..91a9aecfd1b584a9c89b959d704808f3e1d48d6e 100644 (file)
--- a/src/gdcmHeaderIdo.cxx
+++ b/src/gdcmHeaderIdo.cxx
@@ -1,15 +1,5 @@
 // gdcmHeaderIdo.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
 #include "gdcmIdo.h"
 #include "gdcmUtil.h"
 

diff --git a/src/gdcmIdo.h b/src/gdcmIdo.h
index 61796397ee884a17b2feee32db3da04dd10112a6..5884baea549a4690400bcbdafc5ade5dd03ace3e 100644 (file)
--- a/src/gdcmIdo.h
+++ b/src/gdcmIdo.h
@@ -1,6 +1,6 @@
 // gdcmIdo.h
 
-#include "gdcm.h"
+#include "gdcmHeader.h"
 
 class gdcmHeaderIdo: protected gdcmHeader {
 private:

diff --git a/src/gdcmJpeg.cxx b/src/gdcmJpeg.cxx
index 01416f35de0c6b21525687ee9763e3c8e79ab5c9..4b6146409bea80506ad0954ab40977687b74516a 100644 (file)
--- a/src/gdcmJpeg.cxx
+++ b/src/gdcmJpeg.cxx
@@ -1,12 +1,3 @@
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
 
 #include <stdio.h>
 #include "gdcmFile.h"

diff --git a/src/gdcmJpeg12.cxx b/src/gdcmJpeg12.cxx
index 4b1cff5db926e665bac1fd4091380aeb8c8eaa49..1d21f4b20d0b4ecaa1babdcb2339faf15d248024 100644 (file)
--- a/src/gdcmJpeg12.cxx
+++ b/src/gdcmJpeg12.cxx
@@ -1,12 +1,3 @@
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
 
 #include <stdio.h>
 #include "gdcmFile.h"

diff --git a/src/gdcmJpeg2000.cxx b/src/gdcmJpeg2000.cxx
index 293930040df33b40bf900370d037efb873207c46..d8505c26243c27c4ec43f397bfa44ee8ef22973e 100644 (file)
--- a/src/gdcmJpeg2000.cxx
+++ b/src/gdcmJpeg2000.cxx
@@ -1,13 +1,3 @@
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
- 
  
  /* -------------------------------------------------------------------- */
  //

diff --git a/src/gdcmRLE.cxx b/src/gdcmRLE.cxx
index 7bdcee608734f544bf3e5fbb531c1c362d386602..ae9149c3a5ca643c186ab09fdfe2b71cdca04e12 100644 (file)
--- a/src/gdcmRLE.cxx
+++ b/src/gdcmRLE.cxx
@@ -1,12 +1,3 @@
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
 
 #include <stdio.h>
 #include "gdcmFile.h"

diff --git a/src/gdcmTS.cxx b/src/gdcmTS.cxx
index 8ed38d0ba186ac16905aa923526bb87fbd9d8b5b..33f49501f2cfdbe4d0bccff69442e1b649875508 100644 (file)
--- a/src/gdcmTS.cxx
+++ b/src/gdcmTS.cxx
@@ -1,15 +1,5 @@
 // gdcmTS.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
 #include <stdio.h>
 
 #include "gdcmTS.h"

diff --git a/src/gdcmTS.h b/src/gdcmTS.h
index 14d4909cc12a38557868a2975f960b457eb92bc9..6380c07c82328e2834cd6e87cf2ffd84e3af8472 100644 (file)
--- a/src/gdcmTS.h
+++ b/src/gdcmTS.h
@@ -3,9 +3,9 @@
 #ifndef GDCMTS_H
 #define GDCMTS_H
 
+#include "gdcmCommon.h"
 #include <map>
 #include <string>
-#include "gdcmCommon.h"
 
 typedef std::string TSKey;
 typedef std::string TSAtr;

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 90e945b2a1b50c1c88e4ba13c953b130ed83aee7..729d400eaf5ef8b9a99fb8b664ebffae47e2351c 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,19 +1,10 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.24 2003/09/24 13:29:49 jpr Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.25 2003/10/02 11:26:16 malaterre Exp $
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+#include "gdcmUtil.h"
 
 #include <stdio.h>
 #include <ctype.h>   // For isspace
 #include <string.h>
-#include "gdcmUtil.h"
 
 // Library globals.
 gdcmDebug dbg;

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index b96faa3c6db55bb06bc7adedb28d5ece470891d3..2566e82fbd1a15e6f06898e556ee2b7bdd8db81b 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,14 +1,14 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.15 2003/09/22 08:28:43 regrain Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.16 2003/10/02 11:26:16 malaterre Exp $
 
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include <iostream>
-#include <vector>
-#include <string>
 #include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmDictSet.h"
+#include <iostream>
+#include <vector>
+#include <string>
 
 class gdcmDebug {
 private:

diff --git a/src/gdcmVR.cxx b/src/gdcmVR.cxx
index 64d708e366669dd9c5125dd92f6cc703a12a9db7..c20aa4a2f0a5a515f8f72026c11c9a9bf5849543 100644 (file)
--- a/src/gdcmVR.cxx
+++ b/src/gdcmVR.cxx
@@ -1,15 +1,5 @@
 // gdcmVR.cxx
 
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
-
 #include "gdcmVR.h"
 
 gdcmVR::gdcmVR(void) {

diff --git a/src/gdcmVR.h b/src/gdcmVR.h
index 68d7fee3940e5c6fb979329bfba7011fb530db3a..9301e24a2b59b9d24f523cb39cf3681e6c6489fe 100644 (file)
--- a/src/gdcmVR.h
+++ b/src/gdcmVR.h
@@ -3,9 +3,9 @@
 #ifndef GDCMVR_H
 #define GDCMVR_H
 
+#include "gdcmCommon.h"
 #include <map>
 #include <string>
-#include "gdcmCommon.h"
 
 typedef std::string VRKey;
 typedef std::string VRAtr;