Browse Source

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

rdb 10 years ago
parent
commit
e29efdd0c9
1 changed files with 1 additions and 5 deletions
  1. 1 5
      dtool/src/interrogate/interfaceMakerPythonNative.cxx

+ 1 - 5
dtool/src/interrogate/interfaceMakerPythonNative.cxx

@@ -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";