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/XMLTransform/ErrorReporter.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/XMLTransform/ErrorReporter.cpp')
| -rw-r--r-- | cpp/src/XMLTransform/ErrorReporter.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/XMLTransform/ErrorReporter.cpp b/cpp/src/XMLTransform/ErrorReporter.cpp index 12748b3a2cc..275a3ef621a 100644 --- a/cpp/src/XMLTransform/ErrorReporter.cpp +++ b/cpp/src/XMLTransform/ErrorReporter.cpp @@ -21,14 +21,13 @@ using namespace std; using namespace XMLTransform; -ICE_XERCES_NS_USE DOMTreeErrorReporter::DOMTreeErrorReporter() { } void -DOMTreeErrorReporter::warning(const SAXParseException& ex) +DOMTreeErrorReporter::warning(const ICE_XERCES_NS SAXParseException& ex) { ostringstream out; out << "Warning at file \"" << toString(ex.getSystemId()) @@ -39,7 +38,7 @@ DOMTreeErrorReporter::warning(const SAXParseException& ex) } void -DOMTreeErrorReporter::error(const SAXParseException& ex) +DOMTreeErrorReporter::error(const ICE_XERCES_NS SAXParseException& ex) { ostringstream out; out << "Error at file \"" << toString(ex.getSystemId()) @@ -50,7 +49,7 @@ DOMTreeErrorReporter::error(const SAXParseException& ex) } void -DOMTreeErrorReporter::fatalError(const SAXParseException& ex) +DOMTreeErrorReporter::fatalError(const ICE_XERCES_NS SAXParseException& ex) { ostringstream out; out << "Fatal at file \"" << toString(ex.getSystemId()) @@ -83,7 +82,7 @@ DOMTreeErrorReporter::toString(const XMLCh* s) { if(s) { - char* t = XMLString::transcode(s); + char* t = ICE_XERCES_NS XMLString::transcode(s); string r(t); delete[] t; return r; |