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

Diff for /pegasus/src/Pegasus/Common/XmlReader.cpp between version 1.85 and 1.86

version 1.85, 2003/08/01 14:42:55 version 1.86, 2003/08/12 17:51:08
Line 46 
Line 46 
 #include "CIMObject.h" #include "CIMObject.h"
 #include "CIMParamValue.h" #include "CIMParamValue.h"
 #include "System.h" #include "System.h"
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
   #include "OS400ConvertChar.h"
   #endif
 // l10n // l10n
 #include <Pegasus/Common/MessageLoader.h> #include <Pegasus/Common/MessageLoader.h>
  
Line 1235 
Line 1237 
  
         case CIMTYPE_STRING:         case CIMTYPE_STRING:
         {         {
             return CIMValue(String(valueString));              return CIMValue(String(valueString, STRING_FLAG_UTF8));
         }         }
  
         case CIMTYPE_CHAR16:         case CIMTYPE_CHAR16:
Line 1600 
Line 1602 
         expectEndTag(parser, "VALUE");         expectEndTag(parser, "VALUE");
     }     }
  
     str = valueString;      str = String(valueString,STRING_FLAG_UTF8);
     return true;     return true;
 } }
  
Line 2244 
Line 2246 
             throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine());             throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine());
  
         if (entry.type == XmlEntry::CONTENT)         if (entry.type == XmlEntry::CONTENT)
             host = entry.text;              host = String(entry.text,STRING_FLAG_UTF8);
         else         else
     {     {
             parser.putBack(entry);             parser.putBack(entry);
Line 2268 
Line 2270 
  
     }     }
  
     host = entry.text;      host = String(entry.text,STRING_FLAG_UTF8);
 #endif #endif
     expectEndTag(parser, "HOST");     expectEndTag(parser, "HOST");
     return true;     return true;
Line 2528 
Line 2530 
             throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine());             throw XmlException(XmlException::UNCLOSED_TAGS, parser.getLine());
  
         if (entry.type == XmlEntry::CONTENT)         if (entry.type == XmlEntry::CONTENT)
             value = entry.text;              value = String(entry.text,STRING_FLAG_UTF8);
         else         else
             parser.putBack(entry);             parser.putBack(entry);
  


Legend:
Removed from v.1.85  
changed lines
  Added in v.1.86

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2