diff options
author | Benoit Foucher <benoit@zeroc.com> | 2017-01-23 15:52:30 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-23 15:52:30 +0100 |
commit | b33c4f3d57e042346dfd3636c39c0b8039351563 (patch) | |
tree | b9ba437a285ffd07c07691f84147a4c80f77bbb4 /cpp/src | |
parent | Fixed multicast to also listen on link-locap IPv6 addressees (diff) | |
download | ice-b33c4f3d57e042346dfd3636c39c0b8039351563.tar.bz2 ice-b33c4f3d57e042346dfd3636c39c0b8039351563.tar.xz ice-b33c4f3d57e042346dfd3636c39c0b8039351563.zip |
Minor fixes for ICE-6893 - Review calls to abort()
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 4 | ||||
-rw-r--r-- | cpp/src/Slice/Preprocessor.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 4776672ff9a..bd82a31e9a5 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -791,7 +791,7 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread) { // // If called from the user thread we re-throw, the exception - // will be catch by the caller and abort() will be called. + // will be catch by the caller and abort(ex) will be called. // if(userThread) { @@ -1125,7 +1125,7 @@ OutgoingAsync::invoke(const string& operation) // // NOTE: invokeImpl doesn't throw so this can be called from the - // try block with the catch block calling abort() in case of an + // try block with the catch block calling abort(ex) in case of an // exception. // invokeImpl(true); // userThread = true diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 03815d4b4d6..aa47dd1e716 100644 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -392,7 +392,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons // /foo/A.ice /foo/B.ice becomes // /foo/A.ice // /foo/B.ice - // + // // C:\foo\A.ice C:\foo\B.ice becomes // C:\foo\A.ice // C:\foo\B.ice @@ -717,7 +717,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons } default: { - abort(); + assert(false); break; } } |