bf36bf7d8a
Enhance SWIGTYPE "out" typemaps to use std::move when copying
objects, thereby making use of move semantics when wrapping a function returning
by value if the returned type supports move semantics.
Wrapping functions that return move only types 'by value' now work out the box
without having to provide custom typemaps.
The implementation removed all casts in the "out" typemaps to allow the compiler to
appropriately choose calling a move constructor, where possible, otherwise a copy
constructor. The implementation alsoand required modifying SwigValueWrapper to
change a cast operator from:
SwigValueWrapper::operator T&() const;
to
#if __cplusplus >=201103L
SwigValueWrapper::operator T&&() const;
#else
SwigValueWrapper::operator T&() const;
#endif
This is not backwards compatible for C++11 and later when using the valuewrapper feature
if a cast is explicitly being made in user supplied "out" typemaps. Suggested change
in custom "out" typemaps for C++11 and later code:
1. Try remove the cast altogether to let the compiler use an appropriate implicit cast.
2. Change the cast, for example, from static_cast<X &> to static_cast<X &&>, using the
__cplusplus macro if all versions of C++ need to be supported.
Issue #999
Closes #1044
More about the commit:
Added some missing "varout" typemaps for Ocaml which was falling back to
use "out" typemaps as they were missing.
Ruby std::set fix for SwigValueWrapper C++11 changes.
71 lines
2.1 KiB
OpenEdge ABL
71 lines
2.1 KiB
OpenEdge ABL
// Helper interface for cpp11_move_only.i and others
|
|
|
|
%include <std_string.i>
|
|
%catches(std::string) Counter::check_counts;
|
|
|
|
%inline %{
|
|
#include <sstream>
|
|
using namespace std;
|
|
|
|
|
|
struct Counter {
|
|
static int normal_constructor;
|
|
static int copy_constructor;
|
|
static int copy_assignment;
|
|
static int move_constructor;
|
|
static int move_assignment;
|
|
static int destructor;
|
|
static void reset_counts() {
|
|
normal_constructor = 0;
|
|
copy_constructor = 0;
|
|
copy_assignment = 0;
|
|
move_constructor = 0;
|
|
move_assignment = 0;
|
|
destructor = 0;
|
|
}
|
|
// Check against expected counts of constructor, assignment operators etc.
|
|
// Not observed during development, but compiler optimisation could change the expected values.
|
|
// Throws exception if not correct (use %catches to catch them)
|
|
static void check_counts(
|
|
int normal_constructor,
|
|
int copy_constructor,
|
|
int copy_assignment,
|
|
int move_constructor,
|
|
int move_assignment,
|
|
int destructor) {
|
|
bool match = (
|
|
normal_constructor == Counter::normal_constructor &&
|
|
copy_constructor == Counter::copy_constructor &&
|
|
copy_assignment == Counter::copy_assignment &&
|
|
move_constructor == Counter::move_constructor &&
|
|
move_assignment == Counter::move_assignment &&
|
|
destructor == Counter::destructor);
|
|
if (!match) {
|
|
std::stringstream ss;
|
|
ss << "check_counts failed" << std::endl <<
|
|
Counter::normal_constructor << " " <<
|
|
Counter::copy_constructor << " " <<
|
|
Counter::copy_assignment << " " <<
|
|
Counter::move_constructor << " " <<
|
|
Counter::move_assignment << " " <<
|
|
Counter::destructor << " " <<
|
|
" (actual)" << std::endl <<
|
|
normal_constructor << " " <<
|
|
copy_constructor << " " <<
|
|
copy_assignment << " " <<
|
|
move_constructor << " " <<
|
|
move_assignment << " " <<
|
|
destructor << " " <<
|
|
" (expected)" << std::endl;
|
|
throw ss.str();
|
|
}
|
|
}
|
|
};
|
|
|
|
int Counter::normal_constructor = 0;
|
|
int Counter::copy_constructor = 0;
|
|
int Counter::copy_assignment = 0;
|
|
int Counter::move_constructor = 0;
|
|
int Counter::move_assignment = 0;
|
|
int Counter::destructor = 0;
|
|
%}
|