diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-02-08 18:02:47 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-02-08 18:02:47 -0500 |
| commit | cee5e5067eff15b5a22a247805edb6c8dda77074 (patch) | |
| tree | e67d772a753e3ffa491571a101afb43a24824e5e /cpp/src/slice2cpp | |
| parent | Update Debug settings for VS 2017 (VC141) (diff) | |
| download | ice-cee5e5067eff15b5a22a247805edb6c8dda77074.tar.bz2 ice-cee5e5067eff15b5a22a247805edb6c8dda77074.tar.xz ice-cee5e5067eff15b5a22a247805edb6c8dda77074.zip | |
Removed cpp:unscoped from all Ice enums
CompressBatch is now "scoped" in C++98 and ObjC
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index f33bfcb7896..7845b53633c 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2033,7 +2033,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) } else { - C << nl << "::Ice::OutputStream* ostr = result->startWriteParams(" << opFormatTypeToString(p) <<");"; + C << nl << "::Ice::OutputStream* ostr = result->startWriteParams(" << opFormatTypeToString(p, false) <<");"; writeMarshalCode(C, inParams, 0, true, TypeContextInParam); if(p->sendsClasses(false)) { @@ -3057,7 +3057,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) } if(p->format() != DefaultFormat) { - C << nl << "inS.setFormat(" << opFormatTypeToString(p) << ");"; + C << nl << "inS.setFormat(" << opFormatTypeToString(p, false) << ");"; } if(!amd) @@ -6107,7 +6107,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) C << sp; C << nl << "outAsync->invoke(" << flatName << ", "; - C << operationModeToString(p->sendMode(), true) << ", " << opFormatTypeToString(p) << ", context, "; + C << operationModeToString(p->sendMode(), true) << ", " << opFormatTypeToString(p, true) << ", context, "; C.inc(); C << nl; @@ -6178,7 +6178,7 @@ Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "_checkTwowayOnly(" << flatName << ");"; } C << nl << "outAsync->invoke(" << flatName << ", "; - C << operationModeToString(p->sendMode(), true) << ", " << opFormatTypeToString(p) << ", context, "; + C << operationModeToString(p->sendMode(), true) << ", " << opFormatTypeToString(p, true) << ", context, "; C.inc(); C << nl; @@ -7042,7 +7042,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) C << nl << "MarshaledResult(current)"; C.dec(); C << sb; - C << nl << "ostr->startEncapsulation(current.encoding, " << opFormatTypeToString(p) << ");"; + C << nl << "ostr->startEncapsulation(current.encoding, " << opFormatTypeToString(p, true) << ");"; writeMarshalCode(C, outParams, p, true, TypeContextCpp11, "ostr"); if(p->returnsClasses(false)) { @@ -7085,7 +7085,7 @@ Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p) } if(p->format() != DefaultFormat) { - C << nl << "inS.setFormat(" << opFormatTypeToString(p) << ");"; + C << nl << "inS.setFormat(" << opFormatTypeToString(p, true) << ");"; } if(!amd) |