diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
| commit | e6f5dc2c89eda44fb0a3d444223131a31867a1b2 (patch) | |
| tree | b6bddfe0a0cccef45484314f47967d95a01472bb /cpp/src/IceXML/Parser.cpp | |
| parent | more Java changes & tests (diff) | |
| parent | ICE-4804 - Properties and case-mismatch (diff) | |
| download | ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.bz2 ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.xz ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Conflicts:
cpp/include/Ice/Stream.h
cpp/include/Slice/Preprocessor.h
rb/ruby/Makefile.mak
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; |