From e29efdd0c929e3142ecbe43a78dcc60e6049bef5 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 15 Feb 2015 20:26:23 +0100
Subject: [PATCH] Don't use swap() as fallback for std::move(), it's more picky

---
 dtool/src/interrogate/interfaceMakerPythonNative.cxx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dtool/src/interrogate/interfaceMakerPythonNative.cxx b/dtool/src/interrogate/interfaceMakerPythonNative.cxx
index 4c8be10418..a49e87103b 100644
--- a/dtool/src/interrogate/interfaceMakerPythonNative.cxx
+++ b/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";