(file) Return to String.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/String.cpp between version 1.71 and 1.72

version 1.71, 2003/08/20 17:35:53 version 1.72, 2003/08/20 21:14:22
Line 646 
Line 646 
  
         char* str1 = new char[strlen(str)+1];         char* str1 = new char[strlen(str)+1];
         strcpy(str1,str);         strcpy(str1,str);
         delete str;          delete [] str;
  
     return CString(str1);     return CString(str1);
 } }
Line 855 
Line 855 
  
 PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const String& str) PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const String& str)
 { {
 /*  
 #if defined(PEGASUS_OS_OS400) #if defined(PEGASUS_OS_OS400)
     CString cstr = str.getCStringUTF8();     CString cstr = str.getCStringUTF8();
     const char* utf8str = cstr;     const char* utf8str = cstr;
Line 863 
Line 863 
     os << utf8str;     os << utf8str;
  
 #elif defined(PEGASUS_HAS_ICU) #elif defined(PEGASUS_HAS_ICU)
 */  
 #if defined(PEGASUS_HAS_ICU)  
     char *buf = NULL;     char *buf = NULL;
     UnicodeString UniStr((const UChar *)str.getChar16Data(), (int32_t)str.size());     UnicodeString UniStr((const UChar *)str.getChar16Data(), (int32_t)str.size());
  
Line 874 
Line 872 
  
     os << buf;     os << buf;
  
     delete buf;      delete [] buf;
 #else #else
  
  


Legend:
Removed from v.1.71  
changed lines
  Added in v.1.72

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2