diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /cpp/src/IceXML/Parser.cpp | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
Diffstat (limited to 'cpp/src/IceXML/Parser.cpp')
| -rw-r--r-- | cpp/src/IceXML/Parser.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp index a95287489db..d72164c5c5c 100644 --- a/cpp/src/IceXML/Parser.cpp +++ b/cpp/src/IceXML/Parser.cpp @@ -44,11 +44,7 @@ IceXML::ParserException::ice_name() const void IceXML::ParserException::ice_print(std::ostream& out) const { -#ifdef __BCPLUSPLUS__ - IceUtil::Exception::ice_print(out); -#else Exception::ice_print(out); -#endif if(!_reason.empty()) { out << "\n" << _reason; |