diff options
Diffstat (limited to 'cpp/src/slice2cpp/Gen.cpp')
-rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 49e0e1f3eff..7790ec60bf2 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -6392,14 +6392,7 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p) { H << ", "; } - if(isMovable((*q)->type())) - { - H << "::std::move(" << fixKwd((*q)->name()) << ")"; - } - else - { - H << fixKwd((*q)->name()); - } + H << fixKwd((*q)->name()); } H << ")"; @@ -6425,14 +6418,7 @@ Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p) { H << ","; } - if(isMovable((*q)->type())) - { - H << nl << memberName << "(::std::move(" << memberName << "))"; - } - else - { - H << nl << memberName << "(" << memberName << ")"; - } + H << nl << memberName << "(" << memberName << ")"; } H.dec(); @@ -8721,14 +8707,7 @@ Slice::Gen::Cpp11ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& d { upcall += ", "; } - if(isMovable((*q)->type())) - { - upcall += "::std::move(" + fixKwd((*q)->name()) + ")"; - } - else - { - upcall += "" + fixKwd((*q)->name()); - } + upcall += "" + fixKwd((*q)->name()); } upcall += ")"; @@ -8824,14 +8803,7 @@ Slice::Gen::Cpp11ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p) H << ',' << nl; } string memberName = fixKwd((*q)->name()); - if(isMovable((*q)->type())) - { - H << memberName << "(::std::move(" << memberName << "))"; - } - else - { - H << memberName << "(" << memberName << ')'; - } + H << memberName << "(" << memberName << ')'; } H.dec(); |