X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmGlobal.cxx;h=ef16d2b9a9488d328c10205b4c600b57d86f3432;hb=a212c7275fb6052e882a981534b966c09ecc1d4e;hp=2bed919593c4f51fc22af85e8e57dec5d61e897d;hpb=a7667287c96b694d414791dd93e33e8efe0e3bc6;p=gdcm.git

diff --git a/src/gdcmGlobal.cxx b/src/gdcmGlobal.cxx
index 2bed9195..ef16d2b9 100644
--- a/src/gdcmGlobal.cxx
+++ b/src/gdcmGlobal.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmGlobal.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/03/22 13:19:25 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2007/07/04 15:38:53 $
+  Version:   $Revision: 1.36 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -25,7 +25,7 @@
 #include "gdcmDictSet.h"
 #include "gdcmDicomDirElement.h"
 
-namespace gdcm 
+namespace  GDCM_NAME_SPACE
 {
 //-----------------------------------------------------------------------------
 /// \brief Those global string that are returned by reference everywhere in 
@@ -35,15 +35,15 @@ namespace gdcm
 /// Therefore the actual initialization is done in a cxx file (avoid
 /// duplicated symbol), and an extern is used in gdcmCommon.h
 
-const std::string GDCM_UNKNOWN   = "gdcm::Unknown";
-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";
-const std::string GDCM_NOTASCII  = "gdcm::NotAscii";
-const std::string GDCM_PIXELDATA = "gdcm::Pixel Data to be loaded";
+const std::string GDCM_UNKNOWN   = "GDCM::Unknown";
+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";
+const std::string GDCM_NOTASCII  = "GDCM::NotAscii";
+const std::string GDCM_PIXELDATA = "GDCM::Pixel Data to be loaded";
 
-const std::string GDCM_VRUNKNOWN = "  ";
+const char GDCM_VRUNKNOWN[2] = {' ',' '}; // avoid useless std::string stuff
 
 #ifdef _WIN32
 const char GDCM_FILESEPARATOR = '\\';