COMP: Remove problem with static being define in a common header file

diff --git a/Testing/TestUtil.cxx b/Testing/TestUtil.cxx
index ba4fc909b7eb36fc69887fcebb8b70a7dc888983..d72b8c471de31f7f2cdc7d5e99568d13b05fc40f 100644 (file)
--- a/Testing/TestUtil.cxx
+++ b/Testing/TestUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/19 16:31:06 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2005/08/22 15:38:04 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -33,7 +33,7 @@ int TestUtil(int , char *[])
    float flt= 1.0;
    double dbl=1.0;
 
-   std::cout << "This is gdcm version: " << gdcm::GetVersion() << std::endl;
+   std::cout << "This is gdcm version: " << gdcm::Util::GetVersion() << std::endl;
 
    std::cout << "---------- uint16 : " << std::dec <<u16 << " = 0x" 
              << std::hex << u16 << std::endl;

diff --git a/src/gdcmCommon.h b/src/gdcmCommon.h
index f07cbcfafc0707d183325633005812e2f62e9a99..c66ad0d5a8ca90bd065ea0f8129ce8e314dfe1a6 100644 (file)
--- a/src/gdcmCommon.h
+++ b/src/gdcmCommon.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmCommon.h,v $
   Language:  C++
-  Date:      $Date: 2005/08/19 16:31:07 $
-  Version:   $Revision: 1.84 $
+  Date:      $Date: 2005/08/22 15:38:05 $
+  Version:   $Revision: 1.85 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -209,13 +209,6 @@ struct Element
    std::string Value;
 };
 
-// Provide a simple static GetVersion() function
-
-static const char *GetVersion()
-{
-  return GDCM_VERSION;
-}
-
 } //namespace gdcm
 //-----------------------------------------------------------------------------
 #endif

diff --git a/src/gdcmFileHelper.cxx b/src/gdcmFileHelper.cxx
index fbe60368d663364addbd6b8fdc5cfc4da1e80d92..db8fb4509060e95de5be55a7f971728dde35c453 100644 (file)
--- a/src/gdcmFileHelper.cxx
+++ b/src/gdcmFileHelper.cxx
@@ -4,8 +4,8 @@
   Module:    $RCSfile: gdcmFileHelper.cxx,v $
   Language:  C++
 
-  Date:      $Date: 2005/08/20 09:04:50 $
-  Version:   $Revision: 1.53 $
+  Date:      $Date: 2005/08/22 15:38:05 $
+  Version:   $Revision: 1.54 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -1241,6 +1241,8 @@ void FileHelper::CheckMandatoryElements()
 
    // 'Implementation Version Name'
       ValEntry *e_0002_0013 = CopyValEntry(0x0002,0x0013);
+      std::string version = "GDCM ";
+      version += Util::GetVersion();
       e_0002_0013->SetValue("GDCM 1.1");
       Archive->Push(e_0002_0013);
 

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 6551051bf31cb213d096f681f0ca95faf5c0b65c..95e9a07781b0aaed6c26de3cd6b48f12eec5a8e0 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/07/18 10:20:20 $
-  Version:   $Revision: 1.157 $
+  Date:      $Date: 2005/08/22 15:38:05 $
+  Version:   $Revision: 1.158 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -331,6 +331,14 @@ std::string Util::GetCurrentDateTime()
    return tmpAll;
 }
 
+/* 
+ * \brief Provide a simple static GetVersion() function
+ */
+std::string Util::GetVersion()
+{
+  return GDCM_VERSION;
+}
+
 unsigned int Util::GetCurrentThreadID()
 {
 // FIXME the implementation is far from complete

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 1a0be66eae699c31abc456e2407bfc782e5984e3..3a7971b28486546cb5997952700aa807ef19b44a 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2005/07/21 05:02:12 $
-  Version:   $Revision: 1.59 $
+  Date:      $Date: 2005/08/22 15:38:05 $
+  Version:   $Revision: 1.60 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -50,6 +50,7 @@ public:
    static std::string GetCurrentDate();
    static std::string GetCurrentTime();
    static std::string GetCurrentDateTime();
+   static std::string GetVersion();
    static unsigned int GetCurrentThreadID();
    static unsigned int GetCurrentProcessID();
    static bool         IsCurrentProcessorBigEndian();