diff options
| author | Mark Spruiell <mes@zeroc.com> | 2003-02-23 22:31:59 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2003-02-23 22:31:59 +0000 |
| commit | 708bc0c43122d3b321022f4bcf5389fc3382896f (patch) | |
| tree | 7d40102405000b1f41cf17a07b70f04db6b79fa0 /cpp/src/IceSSL/ConfigParserErrorReporter.cpp | |
| parent | removing operator[] from Freeze map due to MSVC problems (diff) | |
| download | ice-708bc0c43122d3b321022f4bcf5389fc3382896f.tar.bz2 ice-708bc0c43122d3b321022f4bcf5389fc3382896f.tar.xz ice-708bc0c43122d3b321022f4bcf5389fc3382896f.zip | |
qualify all Xerces types to avoid conflict with VC7
Diffstat (limited to 'cpp/src/IceSSL/ConfigParserErrorReporter.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ConfigParserErrorReporter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/ConfigParserErrorReporter.cpp b/cpp/src/IceSSL/ConfigParserErrorReporter.cpp index 3bb9eeb94a4..b9f215e5c14 100644 --- a/cpp/src/IceSSL/ConfigParserErrorReporter.cpp +++ b/cpp/src/IceSSL/ConfigParserErrorReporter.cpp @@ -23,7 +23,6 @@ #include <sstream> using namespace std; -ICE_XERCES_NS_USE // // Utility to make the usage of xerces easier. @@ -31,7 +30,7 @@ ICE_XERCES_NS_USE static string toString(const XMLCh* s) { - char* t = XMLString::transcode(s); + char* t = ICE_XERCES_NS XMLString::transcode(s); string r(t); delete[] t; return r; @@ -50,7 +49,7 @@ IceSSL::ConfigParserErrorReporter::~ConfigParserErrorReporter() } void -IceSSL::ConfigParserErrorReporter::warning(const SAXParseException& toCatch) +IceSSL::ConfigParserErrorReporter::warning(const ICE_XERCES_NS SAXParseException& toCatch) { if(_traceLevels->security >= IceSSL::SECURITY_PARSE_WARNINGS) { @@ -65,7 +64,7 @@ IceSSL::ConfigParserErrorReporter::warning(const SAXParseException& toCatch) } void -IceSSL::ConfigParserErrorReporter::error(const SAXParseException& toCatch) +IceSSL::ConfigParserErrorReporter::error(const ICE_XERCES_NS SAXParseException& toCatch) { _errorCount++; @@ -77,7 +76,7 @@ IceSSL::ConfigParserErrorReporter::error(const SAXParseException& toCatch) } void -IceSSL::ConfigParserErrorReporter::fatalError(const SAXParseException& toCatch) +IceSSL::ConfigParserErrorReporter::fatalError(const ICE_XERCES_NS SAXParseException& toCatch) { _errorCount++; |