-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.19 2003/09/24 11:37:10 jpr Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.25 2003/10/02 11:26:16 malaterre Exp $
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+#include "gdcmUtil.h"
#include <stdio.h>
#include <ctype.h> // For isspace
#include <string.h>
-#include "gdcmUtil.h"
// Library globals.
gdcmDebug dbg;
void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
if (Level > DebugLevel)
return ;
- std::cerr << Msg1 << ' ' << Msg2 << '\n';
+ std::cerr << Msg1 << ' ' << Msg2 << std::endl;
}
void gdcmDebug::Assert(int Level, bool Test,
if (Level > DebugLevel)
return ;
if (!Test)
- std::cerr << Msg1 << ' ' << Msg2 << '\n';
+ std::cerr << Msg1 << ' ' << Msg2 << std::endl;
}
void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
if (!Test)
return;
- std::cerr << Msg1 << ' ' << Msg2 << '\n';
+ std::cerr << Msg1 << ' ' << Msg2 << std::endl;
Exit(1);
}
void gdcmDebug::Error(const char* Msg1, const char* Msg2,
const char* Msg3) {
- std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n';
+ std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
Exit(1);
}
///////////////////////////////////////////////////////////////////////////
// Because is not yet available in g++2.96
-istream& eatwhite(istream& is) {
+std::istream& eatwhite(std::istream& is) {
char c;
while (is.get(c)) {
if (!isspace(c)) {
///////////////////////////////////////////////////////////////////////////
// Because is not available in C++ (?)
-void Tokenize (const string& str,
- vector<string>& tokens,
- const string& delimiters) {
- string::size_type lastPos = str.find_first_not_of(delimiters,0);
- string::size_type pos = str.find_first_of (delimiters,lastPos);
- while (string::npos != pos || string::npos != lastPos) {
+void Tokenize (const std::string& str,
+ std::vector<std::string>& tokens,
+ const std::string& delimiters) {
+ std::string::size_type lastPos = str.find_first_not_of(delimiters,0);
+ std::string::size_type pos = str.find_first_of (delimiters,lastPos);
+ while (std::string::npos != pos || std::string::npos != lastPos) {
tokens.push_back(str.substr(lastPos, pos - lastPos));
lastPos = str.find_first_not_of(delimiters, pos);
pos = str.find_first_of (delimiters, lastPos);
*di = '.';
}
return d;*/
- string str=s;
+ std::string str=s;
for(int i=0;i<str.size();i++)
{
if(!isprint(str[i]))
std::string TranslateToKey(guint16 group, guint16 element) {
char trash[10];
- string key;
+ std::string key;
// CLEAN ME: better call the iostream<< with the hex manipulator on.
// This requires some reading of the stdlibC++ sources to make the
// proper call (or copy).