ENH: properly handle compiler that does not have __FUNCTION__

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 403397b7f419bd5ce24eb668b2eb15493508057b..e4490b624db2866613ed47541471fb8629abd30a 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,30 +1,74 @@
-// gdcmUtil.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2005/01/06 20:03:28 $
+  Version:   $Revision: 1.48 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
 
-#include "gdcmCommon.h"
-
+namespace gdcm 
+{
 /**
  * \defgroup Globals Utility functions
- * \brief    Here are some utility functions, belonging to NO class,
+ * \brief    Here are some utility functions, belonging to the Util class,
  *           dealing with strings, file names... that can be called
  *           from anywhere by whomsoever they can help.
  */
 
 //-----------------------------------------------------------------------------
-GDCM_EXPORT std::istream & eatwhite(std::istream & is);
 
-GDCM_EXPORT void Tokenize (const std::string& str,
-               std::vector<std::string>& tokens,
-               const std::string& delimiters = " ");
+class GDCM_EXPORT Util
+{
+public:
+   static std::string Format(const char *format, ...);
+   static void        Tokenize (const std::string &str,
+                                std::vector<std::string> &tokens,
+                                const std::string &delimiters = " ");
+   static int         CountSubstring (const std::string &str,
+                                      const std::string &subStr);       
+
+   static std::string CreateCleanString(std::string const &s);
+   static std::string NormalizePath(std::string const &name);
+   static std::string GetPath(std::string const &fullName);
+   static std::string GetName(std::string const &fullName);
+   static std::string GetCurrentDate();
+   static std::string GetCurrentTime();
+
+   static std::string DicomString(const char *s, size_t l);
+   static std::string DicomString(const char *s);
+   static bool        DicomStringEqual(const std::string &s1, const char *s2);
+   static std::string CreateUniqueUID(const std::string &root = "");
+   static bool        IsCurrentProcessorBigEndian();
+
+   static std::string GetMACAddress();
+
+private:
+   static std::string GetIPAddress(); //Do not expose this method
+};
 
-GDCM_EXPORT std::string CreateCleanString(std::string s);
-GDCM_EXPORT void        NormalizePath(std::string &name);
-GDCM_EXPORT std::string GetPath(std::string &fullName);
-GDCM_EXPORT std::string GetName(std::string &fullName);
+   template <class T> 
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const T &val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint16_t &val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint32_t &val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const char *val);
+   GDCM_EXPORT std::ostream &binary_write(std::ostream &os, std::string const & val);
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif