RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use swap() as fallback for std::move(), it's more picky

This commit is contained in:
rdb 2015-02-15 20:26:23 +01:00
parent 9513046e59
commit e29efdd0c9
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtool/src/interrogate/interfaceMakerPythonNative.cxx
View File

@ -4930,11 +4930,7 @@ write_function_instance(ostream &out, FunctionRemap *remap,
}
if (TypeManager::is_reference_count(return_type)) {
out << "#ifdef USE_MOVE_SEMANTICS\n";
indent(out, indent_level) << "coerced = std::move(" << return_expr << ");\n";
out << "#else\n";
indent(out, indent_level) << "swap(coerced, " << return_expr << ");\n";
out << "#endif\n";
indent(out, indent_level) << "coerced = MOVE(" << return_expr << ");\n";
} else {
indent(out, indent_level) << "coerced = " << return_expr << ";\n";
indent(out, indent_level) << "manage = true;\n";