X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmCommon.h;h=6f7b60054329a79e5d460af5476a3035efc21c3a;hb=5919c78e996a255bea8a66da67165df8b753e582;hp=ec41506b2d68ab12f18721a36a921bec4855b935;hpb=db91081ed6cb576b48e2b0ae04550f5f8ed0770a;p=gdcm.git

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index ec41506b..6f7b6005 100644
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2004/11/30 17:14:12 $
-  Version:   $Revision: 1.42 $
+  Date:      $Date: 2005/01/10 18:09:07 $
+  Version:   $Revision: 1.47 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -45,22 +45,11 @@
 #endif //_MSC_VER
 
 //-----------------------------------------------------------------------------
-// ifdef for old gcc compiler
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-#  include <strstream>
-#  define  ostringstream ostrstream
-# else
-#  include <sstream>
-#endif
-
-#include <string>
-#include <assert.h>
-
 #ifdef GDCM_HAVE_STDINT_H
 #include <stdint.h>   // For uint8_t uint16_t and uint32_t
 #else
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-typedef    signed char   int8_t;
+typedef  signed char    int8_t;
 #endif
 typedef  unsigned char  uint8_t;
 typedef  unsigned short uint16_t;
@@ -74,6 +63,8 @@ typedef  unsigned int   uint32_t;
 #define GDCM_EXPORT
 #endif
 
+#include <string>
+
 namespace gdcm
 {
 
@@ -87,10 +78,11 @@ namespace gdcm
 #define DICT_TS           "dicomTS.dic"
 #define DICT_VR           "dicomVR.dic"
 
-const std::string GDCM_UNFOUND   = "gdcm::Unfound";
-const std::string GDCM_BINLOADED = "gdcm::Binary data loaded";
-const std::string GDCM_NOTLOADED = "gdcm::NotLoaded";
-const std::string GDCM_UNREAD    = "gdcm::UnRead";
+GDCM_EXPORT extern const std::string GDCM_UNKNOWN;
+GDCM_EXPORT extern const std::string GDCM_UNFOUND;
+GDCM_EXPORT extern const std::string GDCM_BINLOADED;
+GDCM_EXPORT extern const std::string GDCM_NOTLOADED;
+GDCM_EXPORT extern const std::string GDCM_UNREAD;
 
 /// \brief TagKey is made to hold an "universal" (as in URL, Universal
 ///        Ressource Locator)  key to a DocEntry i.e. a dicom tag.
@@ -123,11 +115,11 @@ typedef std::string TagKey;
 typedef std::string TagName;
 
 enum FileType {
-      Unknown = 0,
-      ExplicitVR, // DicomDir is in this case
-      ImplicitVR,
-      ACR,
-      ACR_LIBIDO
+   Unknown = 0,
+   ExplicitVR, // DicomDir is in this case
+   ImplicitVR,
+   ACR,
+   ACR_LIBIDO
 };
 } //namespace gdcm
 //-----------------------------------------------------------------------------