diff options
author | Jose <jose@zeroc.com> | 2017-04-10 11:52:28 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2017-04-10 11:52:28 +0200 |
commit | ff85ad10acbd3ef24be25ad333de7cbf2880ff71 (patch) | |
tree | feb950f850905aca0aa9f1a6e2a0c1bb4c759516 /cpp/src | |
parent | Fixed signature of IceBox Service factory function in C++11 (diff) | |
download | ice-ff85ad10acbd3ef24be25ad333de7cbf2880ff71.tar.bz2 ice-ff85ad10acbd3ef24be25ad333de7cbf2880ff71.tar.xz ice-ff85ad10acbd3ef24be25ad333de7cbf2880ff71.zip |
Fix (ICE-7762) - Change dispatch bool return value
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/Ice/Object.cpp | 16 | ||||
-rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 8 | ||||
-rw-r--r-- | cpp/src/slice2java/GenCompat.cpp | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index aa053d59d1d..0b4a3295126 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -137,7 +137,7 @@ Ice::Object::_iceD_ice_isA(Incoming& inS, const Current& current) OutputStream* ostr = inS.startWriteParams(); ostr->write(ret); inS.endWriteParams(); - return false; + return true; } bool @@ -146,7 +146,7 @@ Ice::Object::_iceD_ice_ping(Incoming& inS, const Current& current) inS.readEmptyParams(); ice_ping(current); inS.writeEmptyParams(); - return false; + return true; } bool @@ -157,7 +157,7 @@ Ice::Object::_iceD_ice_ids(Incoming& inS, const Current& current) OutputStream* ostr = inS.startWriteParams(); ostr->write(&ret[0], &ret[0] + ret.size(), false); inS.endWriteParams(); - return false; + return true; } bool @@ -168,7 +168,7 @@ Ice::Object::_iceD_ice_id(Incoming& inS, const Current& current) OutputStream* ostr = inS.startWriteParams(); ostr->write(ret, false); inS.endWriteParams(); - return false; + return true; } @@ -356,7 +356,7 @@ Ice::Blobject::_iceDispatch(Incoming& in, const Current& current) { in.writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok); } - return false; + return true; } bool @@ -376,7 +376,7 @@ Ice::BlobjectArray::_iceDispatch(Incoming& in, const Current& current) { in.writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok); } - return false; + return true; } bool @@ -404,7 +404,7 @@ Ice::BlobjectAsync::_iceDispatch(Incoming& in, const Current& current) #else ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), vector<Byte>(inEncaps, inEncaps + sz), current); #endif - return true; + return false; } bool @@ -426,5 +426,5 @@ Ice::BlobjectArrayAsync::_iceDispatch(Incoming& in, const Current& current) #else ice_invoke_async(new ::IceAsync::Ice::AMD_Object_ice_invoke(in), inEncaps, current); #endif - return true; + return false; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index b09983d0f45..c8bd53530e6 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -3081,12 +3081,12 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) { C << nl << "inS.writeEmptyParams();"; } - C << nl << "return false;"; + C << nl << "return true;"; } else { C << nl << "this->" << name << "_async" << argsAMD << ';'; - C << nl << "return true;"; + C << nl << "return false;"; } C << eb; } @@ -7144,7 +7144,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) C << nl << "inS.writeEmptyParams();"; } } - C << nl << "return false;"; + C << nl << "return true;"; } else { @@ -7164,7 +7164,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) C << eb << ';'; } C << nl << "this->" << opName << spar << args << epar << ';'; - C << nl << "return true;"; + C << nl << "return false;"; } C << eb; } diff --git a/cpp/src/slice2java/GenCompat.cpp b/cpp/src/slice2java/GenCompat.cpp index ff344f57bf8..28d724f8646 100644 --- a/cpp/src/slice2java/GenCompat.cpp +++ b/cpp/src/slice2java/GenCompat.cpp @@ -1409,7 +1409,7 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe { out << nl << "inS.writeEmptyParams();"; } - out << nl << "return false;"; + out << nl << "return true;"; out << eb; } @@ -1501,7 +1501,7 @@ Slice::JavaCompatVisitor::writeDispatchAndMarshalling(Output& out, const ClassDe out << ", "; } out << "current);"; - out << nl << "return true;"; + out << nl << "return false;"; out << eb; } |