COMP: warning C4390: ';' : empty controlled statement found; is this the intent?

[gdcm.git] / src / gdcmGlobal.h

diff --git a/src/gdcmGlobal.h b/src/gdcmGlobal.h
index 677f97cc6c2f3c8f2028591c78e35aff6048d5e9..7043d6d60aa71a5aa091c9f52e21cbb41f0f75a6 100644 (file)
--- a/src/gdcmGlobal.h
+++ b/src/gdcmGlobal.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmGlobal.h,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2004/10/12 04:35:46 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -24,27 +24,32 @@
 #include "gdcmDictSet.h"
 #include "gdcmDicomDirElement.h"
 
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
 /**
  * \brief   This class contains all globals elements that might be
  *          instanciated only once (singletons).
  */
-class GDCM_EXPORT gdcmGlobal {
+class GDCM_EXPORT Global
+{
 public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
+   Global();
+   ~Global();
 
-   static gdcmDictSet *GetDicts(void);
-   static gdcmVR *GetVR(void);
-   static gdcmTS *GetTS(void);
-   static gdcmDicomDirElement *GetDicomDirElements(void);
+   static DictSet *GetDicts();
+   static VR *GetVR();
+   static TS *GetTS();
+   static DicomDirElement *GetDicomDirElements();
 
 private:
-   static gdcmDictSet *Dicts; 
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDicomDirElement *ddElem;
+   static DictSet *Dicts; 
+   static VR *ValRes;
+   static TS *TranSyn; 
+   static DicomDirElement *ddElem;
 };
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------
 #endif