From bf115a5c062751e3199f332fe0f1dc5e21051c04 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 4 Nov 2020 14:16:00 +0100
Subject: [PATCH] rm ifn swig
---
Device/Histo/SimulationResult.h | 2 --
auto/Wrap/libBornAgainDevice.py | 1 +
auto/Wrap/libBornAgainDevice_wrap.cpp | 37 ++++++++++++++++++++++++++-
3 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/Device/Histo/SimulationResult.h b/Device/Histo/SimulationResult.h
index dee399c5d59..ba5c6126b73 100644
--- a/Device/Histo/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -44,9 +44,7 @@ public:
SimulationResult(const OutputData<double>& data, const IUnitConverter& unit_converter);
SimulationResult(const SimulationResult& other);
-#ifndef SWIG
SimulationResult(SimulationResult&& other);
-#endif
SimulationResult& operator=(const SimulationResult& other);
SimulationResult& operator=(SimulationResult&& other);
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 73e00a8ef26..a7e8a2f4c37 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -6082,6 +6082,7 @@ class SimulationResult(object):
__init__(SimulationResult self) -> SimulationResult
__init__(SimulationResult self, IntensityData data, IUnitConverter unit_converter) -> SimulationResult
__init__(SimulationResult self, SimulationResult other) -> SimulationResult
+ __init__(SimulationResult self, SimulationResult other) -> SimulationResult
SimulationResult::SimulationResult(SimulationResult &&other)
"""
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index ef74f231d21..6aaa54411af 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -44907,6 +44907,30 @@ fail:
}
+SWIGINTERN PyObject *_wrap_new_SimulationResult__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+ PyObject *resultobj = 0;
+ SimulationResult *arg1 = 0 ;
+ void *argp1 = 0 ;
+ int res1 = 0 ;
+ SimulationResult *result = 0 ;
+
+ if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+ res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_SimulationResult, 0 );
+ if (!SWIG_IsOK(res1)) {
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_SimulationResult" "', argument " "1"" of type '" "SimulationResult &&""'");
+ }
+ if (!argp1) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_SimulationResult" "', argument " "1"" of type '" "SimulationResult &&""'");
+ }
+ arg1 = reinterpret_cast< SimulationResult * >(argp1);
+ result = (SimulationResult *)new SimulationResult((SimulationResult &&)*arg1);
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_SimulationResult, SWIG_POINTER_NEW | 0 );
+ return resultobj;
+fail:
+ return NULL;
+}
+
+
SWIGINTERN PyObject *_wrap_new_SimulationResult(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[3] = {
@@ -44926,6 +44950,15 @@ SWIGINTERN PyObject *_wrap_new_SimulationResult(PyObject *self, PyObject *args)
return _wrap_new_SimulationResult__SWIG_2(self, argc, argv);
}
}
+ if (argc == 1) {
+ int _v;
+ void *vptr = 0;
+ int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, SWIG_POINTER_NO_NULL);
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_new_SimulationResult__SWIG_3(self, argc, argv);
+ }
+ }
if (argc == 2) {
int _v;
int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_OutputDataT_double_t, SWIG_POINTER_NO_NULL | 0);
@@ -44944,7 +44977,8 @@ fail:
" Possible C/C++ prototypes are:\n"
" SimulationResult::SimulationResult()\n"
" SimulationResult::SimulationResult(OutputData< double > const &,IUnitConverter const &)\n"
- " SimulationResult::SimulationResult(SimulationResult const &)\n");
+ " SimulationResult::SimulationResult(SimulationResult const &)\n"
+ " SimulationResult::SimulationResult(SimulationResult &&)\n");
return 0;
}
@@ -48625,6 +48659,7 @@ static PyMethodDef SwigMethods[] = {
{ "new_SimulationResult", _wrap_new_SimulationResult, METH_VARARGS, "\n"
"SimulationResult()\n"
"SimulationResult(IntensityData data, IUnitConverter unit_converter)\n"
+ "SimulationResult(SimulationResult other)\n"
"new_SimulationResult(SimulationResult other) -> SimulationResult\n"
"SimulationResult::SimulationResult(SimulationResult &&other)\n"
"\n"
--
GitLab