Merge branch 'rvalue-move'
* rvalue-move: rvalue reference outputs Remove broken %implicitconv for const SWIGTYPE && Remove unnecessary const SWIGTYPE & typemap Temporarily remove rvalue reference python runtime test std::auto_ptr emulation fix in test case Ocaml typemap typo fix Fix Racket tests using schemerunme directory Docs on rvalue parameter changes Test/fixes to handle NULL pointer for unique_ptr/auto_ptr Octave - SWIG now marshalls a C/C++ NULL pointer into the null matrix, [] Racket - NULL pointer handling SWIGTYPE && input typemaps now assume object has been moved - Go and OCaml SWIGTYPE && input typemaps now assume object has been moved SWIGTYPE && input typemaps now assume object has been moved - Java Cosmetic stray semi-colon removal after %typemap using quotes Cosmetic stray semi-colon removal after %typemap
This commit is contained in:
commit
c79f7f3d85
132 changed files with 2155 additions and 426 deletions
|
|
@ -43,7 +43,7 @@ namespace swig {
|
|||
%apply PyObject * {SwigPtr_PyObject};
|
||||
%apply PyObject * const& {SwigPtr_PyObject const&};
|
||||
|
||||
%typemap(typecheck,precedence=SWIG_TYPECHECK_SWIGOBJECT,noblock=1) SwigPtr_PyObject const& "$1 = ($input != 0);";
|
||||
%typemap(typecheck,precedence=SWIG_TYPECHECK_SWIGOBJECT,noblock=1) SwigPtr_PyObject const& "$1 = ($input != 0);"
|
||||
|
||||
|
||||
/* For output */
|
||||
|
|
|
|||
|
|
@ -2,43 +2,43 @@
|
|||
// Documentation for use with the autodoc feature.
|
||||
|
||||
#ifdef SWIG_DOC_DOXYGEN_STYLE
|
||||
%typemap(doc) SWIGTYPE "@param $1_name $1_type";
|
||||
%typemap(doc) SWIGTYPE * "@param $1_name $1_type";
|
||||
%typemap(doc) const SWIGTYPE & "@param $1_name $1_type";
|
||||
%typemap(doc) const SWIGTYPE && "@param $1_name $1_type";
|
||||
%typemap(doc) enum SWIGTYPE "@param $1_name enum $1_type";
|
||||
%typemap(doc) SWIGTYPE "@param $1_name $1_type"
|
||||
%typemap(doc) SWIGTYPE * "@param $1_name $1_type"
|
||||
%typemap(doc) const SWIGTYPE & "@param $1_name $1_type"
|
||||
%typemap(doc) const SWIGTYPE && "@param $1_name $1_type"
|
||||
%typemap(doc) enum SWIGTYPE "@param $1_name enum $1_type"
|
||||
|
||||
%typemap(doc) SWIGTYPE *INOUT, SWIGTYPE &INOUT "@param $1_name $1_type (input/output)";
|
||||
%typemap(doc) SWIGTYPE *INPUT, SWIGTYPE &INPUT "@param $1_name $1_type (input)";
|
||||
%typemap(doc) SWIGTYPE *OUTPUT, SWIGTYPE &OUTPUT "@param $1_name $1_type (output)";
|
||||
%typemap(doc) SWIGTYPE *INOUT, SWIGTYPE &INOUT "@param $1_name $1_type (input/output)"
|
||||
%typemap(doc) SWIGTYPE *INPUT, SWIGTYPE &INPUT "@param $1_name $1_type (input)"
|
||||
%typemap(doc) SWIGTYPE *OUTPUT, SWIGTYPE &OUTPUT "@param $1_name $1_type (output)"
|
||||
#else
|
||||
%typemap(doc) SWIGTYPE "$1_name: $1_type";
|
||||
%typemap(doc) SWIGTYPE * "$1_name: $1_type";
|
||||
%typemap(doc) const SWIGTYPE & "$1_name: $1_type";
|
||||
%typemap(doc) const SWIGTYPE && "$1_name: $1_type";
|
||||
%typemap(doc) enum SWIGTYPE "$1_name: enum $1_type";
|
||||
%typemap(doc) SWIGTYPE "$1_name: $1_type"
|
||||
%typemap(doc) SWIGTYPE * "$1_name: $1_type"
|
||||
%typemap(doc) const SWIGTYPE & "$1_name: $1_type"
|
||||
%typemap(doc) const SWIGTYPE && "$1_name: $1_type"
|
||||
%typemap(doc) enum SWIGTYPE "$1_name: enum $1_type"
|
||||
|
||||
%typemap(doc) SWIGTYPE *INOUT, SWIGTYPE &INOUT "$1_name: $1_type (input/output)";
|
||||
%typemap(doc) SWIGTYPE *INPUT, SWIGTYPE &INPUT "$1_name: $1_type (input)";
|
||||
%typemap(doc) SWIGTYPE *OUTPUT, SWIGTYPE &OUTPUT "$1_name: $1_type (output)";
|
||||
%typemap(doc) SWIGTYPE *INOUT, SWIGTYPE &INOUT "$1_name: $1_type (input/output)"
|
||||
%typemap(doc) SWIGTYPE *INPUT, SWIGTYPE &INPUT "$1_name: $1_type (input)"
|
||||
%typemap(doc) SWIGTYPE *OUTPUT, SWIGTYPE &OUTPUT "$1_name: $1_type (output)"
|
||||
#endif
|
||||
|
||||
|
||||
// Types to use in Python documentation for the parameters of the given C++ type.
|
||||
%typemap(doctype) bool "boolean";
|
||||
%typemap(doctype) bool "boolean"
|
||||
|
||||
%define int_doctype_for_cppint_type(cppint_type)
|
||||
%typemap(doctype) cppint_type, unsigned cppint_type "int";
|
||||
%typemap(doctype) cppint_type, unsigned cppint_type "int"
|
||||
%enddef
|
||||
%formacro(int_doctype_for_cppint_type, short, int, long, long long)
|
||||
|
||||
%typemap(doctype) size_t "int";
|
||||
%typemap(doctype) size_t "int"
|
||||
|
||||
%typemap(doctype) enum SWIGTYPE "int";
|
||||
%typemap(doctype) enum SWIGTYPE "int"
|
||||
|
||||
%typemap(doctype) float, double, long double "float";
|
||||
%typemap(doctype) float, double, long double "float"
|
||||
|
||||
%typemap(doctype) char*, std::string "string";
|
||||
%typemap(doctype) char*, std::string "string"
|
||||
|
||||
%typemap(doctype) SWIGTYPE "$1_basetype"
|
||||
%typemap(doctype) SWIGTYPE * "$typemap(doctype, $*1_ltype)"
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
{ SWIG_PY_POINTER, "$symname", 0, 0, (void *)($value), &$descriptor }
|
||||
%typemap(consttab) SWIGTYPE ((* const)(ANY)) = SWIGTYPE ((*)(ANY));
|
||||
|
||||
%typemap(constcode) SWIGTYPE ((*)(ANY)) "";
|
||||
%typemap(constcode) SWIGTYPE ((*)(ANY)) ""
|
||||
%typemap(constcode) SWIGTYPE ((* const)(ANY)) = SWIGTYPE ((*)(ANY));
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue