--- ./bindings/lua/prelude.cxx 2018-12-23 21:59:17.769000000 +0100 +++ ./bindings/lua/prelude.cxx 2019-07-11 23:20:43.367721817 +0200 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.12 + * Version 4.0.0 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -927,7 +927,7 @@ * -------------------------------------------------------------------------- */ /* Push the string STR on the Lua stack, like lua_pushstring, but - prefixed with the the location of the innermost Lua call-point + prefixed with the location of the innermost Lua call-point (as formated by luaL_where). */ SWIGRUNTIME void SWIG_Lua_pusherrstring (lua_State *L, const char *str) @@ -938,7 +938,7 @@ } /* Push a formatted string generated from FMT and following args on - the Lua stack, like lua_pushfstring, but prefixed with the the + the Lua stack, like lua_pushfstring, but prefixed with the location of the innermost Lua call-point (as formated by luaL_where). */ SWIGRUNTIME void SWIG_Lua_pushferrstring (lua_State *L, const char *fmt, ...) @@ -2607,7 +2607,7 @@ switch(constants[i].type) { case SWIG_LUA_INT: lua_pushstring(L,constants[i].name); - lua_pushinteger(L,(lua_Number)constants[i].lvalue); + lua_pushinteger(L,(lua_Integer)constants[i].lvalue); lua_rawset(L,-3); break; case SWIG_LUA_FLOAT: @@ -2618,7 +2618,7 @@ case SWIG_LUA_CHAR: lua_pushstring(L,constants[i].name); { - char c = constants[i].lvalue; + char c = (char)constants[i].lvalue; lua_pushlstring(L,&c,1); } lua_rawset(L,-3); --- ./bindings/perl/Prelude.cxx 2018-12-23 21:59:17.771000000 +0100 +++ ./bindings/perl/Prelude.cxx 2019-07-11 23:21:28.678801480 +0200 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.12 + * Version 4.0.0 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -917,6 +917,7 @@ #define SWIG_ConvertPtr(obj, pp, type, flags) SWIG_Perl_ConvertPtr(SWIG_PERL_OBJECT_CALL obj, pp, type, flags) #define SWIG_ConvertPtrAndOwn(obj, pp, type, flags,own) SWIG_Perl_ConvertPtrAndOwn(SWIG_PERL_OBJECT_CALL obj, pp, type, flags, own) #define SWIG_NewPointerObj(p, type, flags) SWIG_Perl_NewPointerObj(SWIG_PERL_OBJECT_CALL p, type, flags) +#define SWIG_AcquirePtr(ptr, src) SWIG_Perl_AcquirePtr(ptr, src) #define swig_owntype int /* for raw packed data */ @@ -1126,6 +1127,14 @@ return 0; } +/* Acquire a pointer value */ + +SWIGRUNTIME int +SWIG_Perl_AcquirePtr(SWIG_MAYBE_PERL_OBJECT SV *sv, int own) { + /* TODO */ + return 0; +} + /* Function for getting a pointer value */ SWIGRUNTIME int @@ -1289,7 +1298,7 @@ return result; } -/* Convert a packed value value */ +/* Convert a packed pointer value */ SWIGRUNTIME int SWIG_Perl_ConvertPacked(SWIG_MAYBE_PERL_OBJECT SV *obj, void *ptr, int sz, swig_type_info *ty) { swig_cast_info *tc; @@ -1592,7 +1601,7 @@ #define SWIG_name "Preludec::boot_Prelude" #define SWIG_prefix "Preludec::" -#define SWIGVERSION 0x030012 +#define SWIGVERSION 0x040000 #define SWIG_VERSION SWIGVERSION @@ -2197,7 +2206,7 @@ /* isfinite() is a macro for C99 */ # if defined(isfinite) # define SWIG_isfinite(X) (isfinite(X)) -# elif defined __cplusplus && __cplusplus >= 201103L +# elif defined(__cplusplus) && __cplusplus >= 201103L /* Use a template so that this works whether isfinite() is std::isfinite() or * in the global namespace. The reality seems to vary between compiler * versions. @@ -2213,6 +2222,12 @@ return isfinite(x); } # define SWIG_isfinite(X) (SWIG_isfinite_func(X)) +# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# elif defined(__clang__) && defined(__has_builtin) +# if __has_builtin(__builtin_isfinite) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# endif # elif defined(_MSC_VER) # define SWIG_isfinite(X) (_finite(X)) # elif defined(__sun) && defined(__SVR4) @@ -18070,128 +18085,128 @@ SWIG_TypeClientData(SWIGTYPE_p_Prelude__ClientProfile, (void*) "Prelude::ClientProfile"); SWIG_TypeClientData(SWIGTYPE_p_Prelude__Connection, (void*) "Prelude::Connection"); SWIG_TypeClientData(SWIGTYPE_p_Prelude__ConnectionPool, (void*) "Prelude::ConnectionPool"); - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_ASYNC_SEND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::ASYNC_SEND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_FLAGS_ASYNC_SEND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::FLAGS_ASYNC_SEND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_ASYNC_TIMER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::ASYNC_TIMER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_FLAGS_ASYNC_TIMER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::FLAGS_ASYNC_TIMER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_HEARTBEAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::HEARTBEAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_FLAGS_HEARTBEAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::FLAGS_HEARTBEAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_CONNECT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::CONNECT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_FLAGS_CONNECT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::FLAGS_CONNECT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_AUTOCONFIG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::AUTOCONFIG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_FLAGS_AUTOCONFIG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::FLAGS_AUTOCONFIG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_IDMEF_READ", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::IDMEF_READ))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_PERMISSION_IDMEF_READ", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::PERMISSION_IDMEF_READ))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_ADMIN_READ", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::ADMIN_READ))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_PERMISSION_ADMIN_READ", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::PERMISSION_ADMIN_READ))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_IDMEF_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::IDMEF_WRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_PERMISSION_IDMEF_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::PERMISSION_IDMEF_WRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_ADMIN_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::ADMIN_WRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "Client_PERMISSION_ADMIN_WRITE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::Client::PERMISSION_ADMIN_WRITE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_Prelude__Client, (void*) "Prelude::Client"); - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_DEBUG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::DEBUG))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_INFO", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::INFO))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_WARNING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::WARNING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_ERROR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::ERROR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_CRITICAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::CRITICAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_QUIET", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::QUIET))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "PreludeLog_SYSLOG", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::PreludeLog::SYSLOG))); SvREADONLY_on(sv); @@ -18199,204 +18214,204 @@ SWIG_TypeClientData(SWIGTYPE_p_Prelude__PreludeLog, (void*) "Prelude::PreludeLog"); SWIG_TypeClientData(SWIGTYPE_p_Prelude__PreludeError, (void*) "Prelude::PreludeError"); SWIG_TypeClientData(SWIGTYPE_p_Prelude__ClientEasy, (void*) "Prelude::ClientEasy"); - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_EQUAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_EQUAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_EQUAL_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_EQUAL_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_EQUAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_EQUAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_EQUAL_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_EQUAL_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_LESSER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_LESSER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_LESSER_OR_EQUAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_LESSER_OR_EQUAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_GREATER", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_GREATER))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_GREATER_OR_EQUAL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_GREATER_OR_EQUAL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_SUBSTR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_SUBSTR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_SUBSTR_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_SUBSTR_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_SUBSTR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_SUBSTR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_SUBSTR_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_SUBSTR_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_REGEX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_REGEX))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_REGEX_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_REGEX_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_REGEX", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_REGEX))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_REGEX_NOCASE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_REGEX_NOCASE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NULL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NULL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriterion_OPERATOR_NOT_NULL", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriterion::OPERATOR_NOT_NULL))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_Prelude__IDMEFCriterion, (void*) "Prelude::IDMEFCriterion"); - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriteria_OPERATOR_NOT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriteria::OPERATOR_NOT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriteria_OPERATOR_AND", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriteria::OPERATOR_AND))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFCriteria_OPERATOR_OR", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFCriteria::OPERATOR_OR))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; SWIG_TypeClientData(SWIGTYPE_p_Prelude__IDMEFCriteria, (void*) "Prelude::IDMEFCriteria"); - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_UNKNOWN", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_UNKNOWN))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_INT8", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_INT8))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_UINT8", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_UINT8))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_INT16", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_INT16))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_UINT16", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_UINT16))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_INT32", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_INT32))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_UINT32", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_UINT32))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_INT64", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_INT64))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_UINT64", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_UINT64))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_FLOAT", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_FLOAT))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_DOUBLE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_DOUBLE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_STRING", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_STRING))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_TIME", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_TIME))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_DATA", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_DATA))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_ENUM", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_ENUM))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_LIST", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_LIST))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/3.0.12/perl5/perltypemaps.swg,65,%set_constant@*/ do { + /*@SWIG:/usr/share/swig/4.0.0/perl5/perltypemaps.swg,65,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "IDMEFValue_TYPE_CLASS", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(Prelude::IDMEFValue::TYPE_CLASS))); SvREADONLY_on(sv); --- ./bindings/perl/Prelude.pm 2018-12-23 21:59:17.771000000 +0100 +++ ./bindings/perl/Prelude.pm 2019-07-11 23:21:37.114630134 +0200 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 3.0.12 +# Version 4.0.0 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. --- ./bindings/python/prelude.py 2018-12-23 21:59:17.776000000 +0100 +++ ./bindings/python/prelude.py 2019-07-11 23:22:14.316874502 +0200 @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 3.0.12 +# Version 4.0.0 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. @@ -60,16 +60,16 @@ import __builtin__ def _swig_setattr_nondynamic(self, class_type, name, value, static=1): - if (name == "thisown"): + if name == "thisown": return self.this.own(value) - if (name == "this"): + if name == "this": if type(value).__name__ == 'SwigPyObject': self.__dict__[name] = value return method = class_type.__swig_setmethods__.get(name, None) if method: return method(self, value) - if (not static): + if not static: object.__setattr__(self, name, value) else: raise AttributeError("You cannot add attributes to %s" % self) @@ -80,7 +80,7 @@ def _swig_getattr(self, class_type, name): - if (name == "thisown"): + if name == "thisown": return self.this.own() method = class_type.__swig_getmethods__.get(name, None) if method: @@ -98,7 +98,7 @@ def _swig_setattr_nondynamic_method(set): def set_attr(self, name, value): - if (name == "thisown"): + if name == "thisown": return self.this.own(value) if hasattr(self, name) or (name == "this"): set(self, name, value) --- ./bindings/ruby/Prelude.cxx 2018-12-23 21:59:17.778000000 +0100 +++ ./bindings/ruby/Prelude.cxx 2019-07-11 23:22:32.367507865 +0200 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.12 + * Version 4.0.0 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -1192,7 +1192,7 @@ /* ----------------------------------------------------------------------------- * rubytracking.swg * - * This file contains support for tracking mappings from + * This file contains support for tracking mappings from * Ruby objects to C++ objects. This functionality is needed * to implement mark functions for Ruby's mark and sweep * garbage collector. @@ -1219,7 +1219,7 @@ #endif /* Global hash table to store Trackings from C/C++ - structs to Ruby Objects. + structs to Ruby Objects. */ static st_table* swig_ruby_trackings = NULL; @@ -1233,7 +1233,7 @@ /* Create a hash table to store Trackings from C++ objects to Ruby objects. */ - /* Try to see if some other .so has already created a + /* Try to see if some other .so has already created a tracking hash table, which we keep hidden in an instance var in the SWIG module. This is done to allow multiple DSOs to share the same @@ -1292,13 +1292,14 @@ /* This is a helper method that unlinks a Ruby object from its underlying C++ object. This is needed if the lifetime of the - Ruby object is longer than the C++ object */ + Ruby object is longer than the C++ object. */ SWIGRUNTIME void SWIG_RubyUnlinkObjects(void* ptr) { VALUE object = SWIG_RubyInstanceFor(ptr); if (object != Qnil) { - if (TYPE(object) != T_DATA) - abort(); + // object might have the T_ZOMBIE type, but that's just + // because the GC has flagged it as such for a deferred + // destruction. Until then, it's still a T_DATA object. DATA_PTR(object) = 0; } } @@ -1531,10 +1532,11 @@ swig_class *sklass; VALUE klass; VALUE obj; - + if (!ptr) return Qnil; - + + assert(type); if (type->clientdata) { sklass = (swig_class *) type->clientdata; @@ -1542,7 +1544,7 @@ track = sklass->trackObjects; if (track) { obj = SWIG_RubyInstanceFor(ptr); - + /* Check the object's type and make sure it has the correct type. It might not in cases where methods do things like downcast methods. */ @@ -1574,7 +1576,7 @@ obj = Data_Wrap_Struct(klass, 0, 0, ptr); } rb_iv_set(obj, "@__swigtype__", rb_str_new2(type->name)); - + return obj; } @@ -1606,7 +1608,7 @@ SWIGRUNTIME swig_ruby_owntype SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) { swig_ruby_owntype oldown = {0, 0}; - if (obj) { + if (TYPE(obj) == T_DATA) { oldown.datafree = RDATA(obj)->dfree; RDATA(obj)->dfree = own.datafree; } @@ -1722,7 +1724,7 @@ return rb_str_new2(result); } -/* Convert a packed value value */ +/* Convert a packed pointer value */ SWIGRUNTIME int SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) { swig_cast_info *tc; @@ -1888,7 +1890,7 @@ #define SWIG_RUBY_THREAD_END_BLOCK -#define SWIGVERSION 0x030012 +#define SWIGVERSION 0x040000 #define SWIG_VERSION SWIGVERSION @@ -2457,7 +2459,7 @@ } -/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/usr/share/swig/4.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args) { VALUE obj = args[0]; @@ -2502,7 +2504,7 @@ #ifdef SWIG_LONG_LONG_AVAILABLE -/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/usr/share/swig/4.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2ULL(VALUE *args) { VALUE obj = args[0]; @@ -2560,7 +2562,7 @@ } -/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/usr/share/swig/4.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args) { VALUE obj = args[0]; @@ -2590,7 +2592,7 @@ #ifdef SWIG_LONG_LONG_AVAILABLE -/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/usr/share/swig/4.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2LL(VALUE *args) { VALUE obj = args[0]; @@ -2829,6 +2831,20 @@ } +namespace swig { + template struct traits_asptr; + template struct traits_asval; + struct pointer_category; + template struct traits_as; + template struct traits_from; + template struct traits_from_ptr; + template struct noconst_traits; + template swig_type_info* type_info(); + template const char* type_name(); + template VALUE from(const Type& val); +} + + namespace swig { /* @@ -2875,7 +2891,7 @@ template struct traits_asptr { static int asptr(VALUE obj, Type **val) { - Type *p; + Type *p = 0; swig_type_info *descriptor = type_info(); int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; if (SWIG_IsOK(res)) { @@ -2937,15 +2953,15 @@ template struct traits_as { - static Type as(VALUE obj, bool throw_error) { + static Type as(VALUE obj) { Type v; int res = asval(obj, &v); - if (!obj || !SWIG_IsOK(res)) { - if (throw_error) throw std::invalid_argument("bad type"); + if (!SWIG_IsOK(res)) { VALUE lastErr = rb_gv_get("$!"); if (lastErr == Qnil) { SWIG_Error(SWIG_TypeError, swig::type_name()); } + throw std::invalid_argument("bad type"); } return v; } @@ -2953,9 +2969,9 @@ template struct traits_as { - static Type as(VALUE obj, bool throw_error) { + static Type as(VALUE obj) { Type *v = 0; - int res = (obj ? traits_asptr::asptr(obj, &v) : SWIG_ERROR); + int res = traits_asptr::asptr(obj, &v); if (SWIG_IsOK(res) && v) { if (SWIG_IsNewObj(res)) { Type r(*v); @@ -2965,46 +2981,41 @@ return *v; } } else { - // Uninitialized return value, no Type() constructor required. - if (throw_error) throw std::invalid_argument("bad type"); VALUE lastErr = rb_gv_get("$!"); if (lastErr == Qnil) { SWIG_Error(SWIG_TypeError, swig::type_name()); } - static Type *v_def = (Type*) malloc(sizeof(Type)); - memset(v_def,0,sizeof(Type)); - return *v_def; + throw std::invalid_argument("bad type"); } } }; template struct traits_as { - static Type* as(VALUE obj, bool throw_error) { + static Type* as(VALUE obj) { Type *v = 0; - int res = (obj ? traits_asptr::asptr(obj, &v) : SWIG_ERROR); + int res = traits_asptr::asptr(obj, &v); if (SWIG_IsOK(res)) { return v; } else { - if (throw_error) throw std::invalid_argument("bad type"); VALUE lastErr = rb_gv_get("$!"); if (lastErr == Qnil) { SWIG_Error(SWIG_TypeError, swig::type_name()); } - return 0; + throw std::invalid_argument("bad type"); } } }; template - inline Type as(VALUE obj, bool te = false) { - return traits_as< Type, typename traits< Type >::category >::as(obj, te); + inline Type as(VALUE obj) { + return traits_as< Type, typename traits< Type >::category >::as(obj); } template struct traits_check { static bool check(VALUE obj) { - int res = obj ? asval(obj, (Type *)(0)) : SWIG_ERROR; + int res = asval(obj, (Type *)(0)); return SWIG_IsOK(res) ? true : false; } }; @@ -3012,7 +3023,7 @@ template struct traits_check { static bool check(VALUE obj) { - int res = obj ? asptr(obj, (Type **)(0)) : SWIG_ERROR; + int res = asptr(obj, (Type **)(0)); return SWIG_IsOK(res) ? true : false; } }; @@ -3778,8 +3789,8 @@ { VALUE item = rb_ary_entry(_seq, _index ); try { - return swig::as(item, true); - } catch (std::exception& e) { + return swig::as(item); + } catch (const std::invalid_argument& e) { char msg[1024]; sprintf(msg, "in sequence element %d ", _index); VALUE lastErr = rb_gv_get("$!"); @@ -4448,7 +4459,7 @@ /* isfinite() is a macro for C99 */ # if defined(isfinite) # define SWIG_isfinite(X) (isfinite(X)) -# elif defined __cplusplus && __cplusplus >= 201103L +# elif defined(__cplusplus) && __cplusplus >= 201103L /* Use a template so that this works whether isfinite() is std::isfinite() or * in the global namespace. The reality seems to vary between compiler * versions. @@ -4464,6 +4475,12 @@ return isfinite(x); } # define SWIG_isfinite(X) (SWIG_isfinite_func(X)) +# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# elif defined(__clang__) && defined(__has_builtin) +# if __has_builtin(__builtin_isfinite) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# endif # elif defined(_MSC_VER) # define SWIG_isfinite(X) (_finite(X)) # elif defined(__sun) && defined(__SVR4) @@ -4481,7 +4498,7 @@ #endif -/*@SWIG:/usr/share/swig/3.0.12/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ +/*@SWIG:/usr/share/swig/4.0.0/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/ SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args) { VALUE obj = args[0]; @@ -5144,15 +5161,13 @@ arg1 = reinterpret_cast< swig::ConstIterator * >(argp1); try { result = (VALUE)((swig::ConstIterator const *)arg1)->value(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = result; return vresult; fail: @@ -5309,15 +5324,13 @@ arg1 = reinterpret_cast< swig::ConstIterator * >(argp1); try { result = (swig::ConstIterator *)(arg1)->next(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__ConstIterator, 0 | 0 ); return vresult; fail: @@ -5420,15 +5433,13 @@ arg1 = reinterpret_cast< swig::ConstIterator * >(argp1); try { result = (swig::ConstIterator *)(arg1)->previous(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__ConstIterator, 0 | 0 ); return vresult; fail: @@ -5560,15 +5571,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::ConstIterator *)((swig::ConstIterator const *)arg1)->operator +(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__ConstIterator, SWIG_POINTER_OWN | 0 ); return vresult; fail: @@ -5612,15 +5621,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::ConstIterator *)((swig::ConstIterator const *)arg1)->operator -(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__ConstIterator, SWIG_POINTER_OWN | 0 ); return vresult; fail: @@ -5826,15 +5833,13 @@ arg1 = reinterpret_cast< swig::Iterator * >(argp1); try { result = (swig::Iterator *)(arg1)->next(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__Iterator, 0 | 0 ); return vresult; fail: @@ -5937,15 +5942,13 @@ arg1 = reinterpret_cast< swig::Iterator * >(argp1); try { result = (swig::Iterator *)(arg1)->previous(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__Iterator, 0 | 0 ); return vresult; fail: @@ -6143,15 +6146,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::Iterator *)((swig::Iterator const *)arg1)->operator +(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__Iterator, SWIG_POINTER_OWN | 0 ); return vresult; fail: @@ -6195,15 +6196,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::Iterator *)((swig::Iterator const *)arg1)->operator -(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_Ruby_ExceptionType(NULL, Qnil); SWIG_fail; } } - vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__Iterator, SWIG_POINTER_OWN | 0 ); return vresult; fail: --- ./bindings/python/_prelude.cxx 2018-12-23 21:59:17.774000000 +0100 +++ ./bindings/python/_prelude.cxx 2019-07-11 23:56:41.354932234 +0200 @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.12 + * Version 4.0.0 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -179,7 +179,7 @@ /* Use debug wrappers with the Python release dll */ # undef _DEBUG # include -# define _DEBUG +# define _DEBUG 1 #else # include #endif @@ -814,14 +814,16 @@ SWIG_Python_str_AsChar(PyObject *str) { #if PY_VERSION_HEX >= 0x03000000 - char *cstr; - char *newstr; - Py_ssize_t len; + char *newstr = 0; str = PyUnicode_AsUTF8String(str); - PyBytes_AsStringAndSize(str, &cstr, &len); - newstr = (char *) malloc(len+1); - memcpy(newstr, cstr, len+1); - Py_XDECREF(str); + if (str) { + char *cstr; + Py_ssize_t len; + PyBytes_AsStringAndSize(str, &cstr, &len); + newstr = (char *) malloc(len+1); + memcpy(newstr, cstr, len+1); + Py_XDECREF(str); + } return newstr; #else return PyString_AsString(str); @@ -1045,14 +1047,17 @@ PyObject *value = 0; PyObject *traceback = 0; - if (PyErr_Occurred()) PyErr_Fetch(&type, &value, &traceback); + if (PyErr_Occurred()) + PyErr_Fetch(&type, &value, &traceback); if (value) { - char *tmp; PyObject *old_str = PyObject_Str(value); + const char *tmp = SWIG_Python_str_AsChar(old_str); PyErr_Clear(); Py_XINCREF(type); - - PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg); + if (tmp) + PyErr_Format(type, "%s %s", tmp, mesg); + else + PyErr_Format(type, "%s", mesg); SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); Py_DECREF(value); @@ -1716,7 +1721,7 @@ PyObject *res; /* PyObject_CallFunction() has the potential to silently drop - the active active exception. In cases of unnamed temporary + the active exception. In cases of unnamed temporary variable or where we just finished iterating over a generator StopIteration will be active right now, and this needs to remain true upon return from SwigPyObject_dealloc. So save @@ -2486,7 +2491,7 @@ } } -/* Convert a packed value value */ +/* Convert a packed pointer value */ SWIGRUNTIME int SWIG_Python_ConvertPacked(PyObject *obj, void *ptr, size_t sz, swig_type_info *ty) { @@ -2850,14 +2855,16 @@ PyObject *traceback = 0; PyErr_Fetch(&type, &value, &traceback); if (value) { - char *tmp; PyObject *old_str = PyObject_Str(value); + const char *tmp = SWIG_Python_str_AsChar(old_str); + if (!tmp) + tmp = "Invalid error message"; Py_XINCREF(type); PyErr_Clear(); if (infront) { - PyErr_Format(type, "%s %s", mesg, tmp = SWIG_Python_str_AsChar(old_str)); + PyErr_Format(type, "%s %s", mesg, tmp); } else { - PyErr_Format(type, "%s %s", tmp = SWIG_Python_str_AsChar(old_str), mesg); + PyErr_Format(type, "%s %s", tmp, mesg); } SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); @@ -2983,6 +2990,8 @@ Py_INCREF(name); } else { encoded_name = PyUnicode_AsUTF8String(name); + if (!encoded_name) + return -1; } PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name)); Py_DECREF(encoded_name); @@ -3396,10 +3405,10 @@ SWIGINTERN void SwigPyBuiltin_InitBases (PyTypeObject *type, PyTypeObject **bases) { - int base_count = 0; + Py_ssize_t base_count = 0; PyTypeObject **b; PyObject *tuple; - int i; + Py_ssize_t i; if (!bases[0]) { bases[0] = SwigPyObject_type(); @@ -3825,7 +3834,7 @@ #endif #define SWIG_name "_prelude" -#define SWIGVERSION 0x030012 +#define SWIGVERSION 0x040000 #define SWIG_VERSION SWIGVERSION @@ -4705,7 +4714,7 @@ template struct traits_asptr { static int asptr(PyObject *obj, Type **val) { - Type *p; + Type *p = 0; swig_type_info *descriptor = type_info(); int res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR; if (SWIG_IsOK(res)) { @@ -4767,14 +4776,14 @@ template struct traits_as { - static Type as(PyObject *obj, bool throw_error) { + static Type as(PyObject *obj) { Type v; int res = asval(obj, &v); if (!obj || !SWIG_IsOK(res)) { if (!PyErr_Occurred()) { ::SWIG_Error(SWIG_TypeError, swig::type_name()); } - if (throw_error) throw std::invalid_argument("bad type"); + throw std::invalid_argument("bad type"); } return v; } @@ -4782,7 +4791,7 @@ template struct traits_as { - static Type as(PyObject *obj, bool throw_error) { + static Type as(PyObject *obj) { Type *v = 0; int res = (obj ? traits_asptr::asptr(obj, &v) : SWIG_ERROR); if (SWIG_IsOK(res) && v) { @@ -4794,21 +4803,17 @@ return *v; } } else { - // Uninitialized return value, no Type() constructor required. - static Type *v_def = (Type*) malloc(sizeof(Type)); if (!PyErr_Occurred()) { SWIG_Error(SWIG_TypeError, swig::type_name()); } - if (throw_error) throw std::invalid_argument("bad type"); - memset(v_def,0,sizeof(Type)); - return *v_def; + throw std::invalid_argument("bad type"); } } }; template struct traits_as { - static Type* as(PyObject *obj, bool throw_error) { + static Type* as(PyObject *obj) { Type *v = 0; int res = (obj ? traits_asptr::asptr(obj, &v) : SWIG_ERROR); if (SWIG_IsOK(res)) { @@ -4817,15 +4822,14 @@ if (!PyErr_Occurred()) { SWIG_Error(SWIG_TypeError, swig::type_name()); } - if (throw_error) throw std::invalid_argument("bad type"); - return 0; + throw std::invalid_argument("bad type"); } } }; template - inline Type as(PyObject *obj, bool te = false) { - return traits_as::category>::as(obj, te); + inline Type as(PyObject *obj) { + return traits_as::category>::as(obj); } template @@ -5262,16 +5266,16 @@ template::value_type, typename FromOper = from_oper > - class SwigPyIteratorOpen_T : public SwigPyIterator_T + class SwigPyForwardIteratorOpen_T : public SwigPyIterator_T { public: FromOper from; typedef OutIterator out_iterator; typedef ValueType value_type; typedef SwigPyIterator_T base; - typedef SwigPyIteratorOpen_T self_type; + typedef SwigPyForwardIteratorOpen_T self_type; - SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq) + SwigPyForwardIteratorOpen_T(out_iterator curr, PyObject *seq) : SwigPyIterator_T(curr, seq) { } @@ -5293,6 +5297,25 @@ return this; } + }; + + template::value_type, + typename FromOper = from_oper > + class SwigPyIteratorOpen_T : public SwigPyForwardIteratorOpen_T + { + public: + FromOper from; + typedef OutIterator out_iterator; + typedef ValueType value_type; + typedef SwigPyIterator_T base; + typedef SwigPyIteratorOpen_T self_type; + + SwigPyIteratorOpen_T(out_iterator curr, PyObject *seq) + : SwigPyForwardIteratorOpen_T(curr, seq) + { + } + SwigPyIterator *decr(size_t n = 1) { while (n--) { @@ -5305,16 +5328,16 @@ template::value_type, typename FromOper = from_oper > - class SwigPyIteratorClosed_T : public SwigPyIterator_T + class SwigPyForwardIteratorClosed_T : public SwigPyIterator_T { public: FromOper from; typedef OutIterator out_iterator; typedef ValueType value_type; typedef SwigPyIterator_T base; - typedef SwigPyIteratorClosed_T self_type; + typedef SwigPyForwardIteratorClosed_T self_type; - SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) + SwigPyForwardIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) : SwigPyIterator_T(curr, seq), begin(first), end(last) { } @@ -5344,10 +5367,33 @@ return this; } + protected: + out_iterator begin; + out_iterator end; + }; + + template::value_type, + typename FromOper = from_oper > + class SwigPyIteratorClosed_T : public SwigPyForwardIteratorClosed_T + { + public: + FromOper from; + typedef OutIterator out_iterator; + typedef ValueType value_type; + typedef SwigPyIterator_T base; + typedef SwigPyForwardIteratorClosed_T base0; + typedef SwigPyIteratorClosed_T self_type; + + SwigPyIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, PyObject *seq) + : SwigPyForwardIteratorClosed_T(curr, first, last, seq) + { + } + SwigPyIterator *decr(size_t n = 1) { while (n--) { - if (base::current == begin) { + if (base::current == base0::begin) { throw stop_iteration(); } else { --base::current; @@ -5355,12 +5401,16 @@ } return this; } - - private: - out_iterator begin; - out_iterator end; }; + + template + inline SwigPyIterator* + make_output_forward_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0) + { + return new SwigPyForwardIteratorClosed_T(current, begin, end, seq); + } + template inline SwigPyIterator* make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, PyObject *seq = 0) @@ -5370,6 +5420,13 @@ template inline SwigPyIterator* + make_output_forward_iterator(const OutIter& current, PyObject *seq = 0) + { + return new SwigPyForwardIteratorOpen_T(current, seq); + } + + template + inline SwigPyIterator* make_output_iterator(const OutIter& current, PyObject *seq = 0) { return new SwigPyIteratorOpen_T(current, seq); @@ -5392,8 +5449,8 @@ { swig::SwigVar_PyObject item = PySequence_GetItem(_seq, _index); try { - return swig::as(item, true); - } catch (std::exception& e) { + return swig::as(item); + } catch (const std::invalid_argument& e) { char msg[1024]; sprintf(msg, "in sequence element %d ", (int)_index); if (!PyErr_Occurred()) { @@ -6038,7 +6095,7 @@ /* isfinite() is a macro for C99 */ # if defined(isfinite) # define SWIG_isfinite(X) (isfinite(X)) -# elif defined __cplusplus && __cplusplus >= 201103L +# elif defined(__cplusplus) && __cplusplus >= 201103L /* Use a template so that this works whether isfinite() is std::isfinite() or * in the global namespace. The reality seems to vary between compiler * versions. @@ -6054,6 +6111,12 @@ return isfinite(x); } # define SWIG_isfinite(X) (SWIG_isfinite_func(X)) +# elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# elif defined(__clang__) && defined(__has_builtin) +# if __has_builtin(__builtin_isfinite) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# endif # elif defined(_MSC_VER) # define SWIG_isfinite(X) (_finite(X)) # elif defined(__sun) && defined(__SVR4) @@ -6779,15 +6842,13 @@ arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1); try { result = (PyObject *)((swig::SwigPyIterator const *)arg1)->value(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = result; return resultobj; fail: @@ -6795,7 +6856,7 @@ } -SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; size_t arg2 ; @@ -6818,15 +6879,13 @@ arg2 = static_cast< size_t >(val2); try { result = (swig::SwigPyIterator *)(arg1)->incr(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 | 0 ); return resultobj; fail: @@ -6834,7 +6893,7 @@ } -SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -6849,15 +6908,13 @@ arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1); try { result = (swig::SwigPyIterator *)(arg1)->incr(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 | 0 ); return resultobj; fail: @@ -6889,7 +6946,7 @@ } -SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; size_t arg2 ; @@ -6912,15 +6969,13 @@ arg2 = static_cast< size_t >(val2); try { result = (swig::SwigPyIterator *)(arg1)->decr(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 | 0 ); return resultobj; fail: @@ -6928,7 +6983,7 @@ } -SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -6943,15 +6998,13 @@ arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1); try { result = (swig::SwigPyIterator *)(arg1)->decr(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 | 0 ); return resultobj; fail: @@ -7011,11 +7064,9 @@ arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); try { result = ((swig::SwigPyIterator const *)arg1)->distance((swig::SwigPyIterator const &)*arg2); - } - catch(std::invalid_argument &_e) { + } catch(std::invalid_argument &_e) { SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail; } - resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result)); return resultobj; fail: @@ -7051,11 +7102,9 @@ arg2 = reinterpret_cast< swig::SwigPyIterator * >(argp2); try { result = (bool)((swig::SwigPyIterator const *)arg1)->equal((swig::SwigPyIterator const &)*arg2); - } - catch(std::invalid_argument &_e) { + } catch(std::invalid_argument &_e) { SWIG_Python_Raise(SWIG_NewPointerObj((new std::invalid_argument(static_cast< const std::invalid_argument& >(_e))),SWIGTYPE_p_std__invalid_argument,SWIG_POINTER_OWN), "std::invalid_argument", SWIGTYPE_p_std__invalid_argument); SWIG_fail; } - resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: @@ -7101,15 +7150,13 @@ arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1); try { result = (PyObject *)(arg1)->next(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = result; return resultobj; fail: @@ -7133,15 +7180,13 @@ arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1); try { result = (PyObject *)(arg1)->__next__(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = result; return resultobj; fail: @@ -7165,15 +7210,13 @@ arg1 = reinterpret_cast< swig::SwigPyIterator * >(argp1); try { result = (PyObject *)(arg1)->previous(); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = result; return resultobj; fail: @@ -7206,15 +7249,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::SwigPyIterator *)(arg1)->advance(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, 0 | 0 ); return resultobj; fail: @@ -7252,7 +7293,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -7286,7 +7329,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -7315,15 +7360,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::SwigPyIterator *) &(arg1)->operator +=(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -7356,15 +7399,13 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::SwigPyIterator *) &(arg1)->operator -=(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: @@ -7397,23 +7438,23 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator +(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } -SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; ptrdiff_t arg2 ; @@ -7436,23 +7477,23 @@ arg2 = static_cast< ptrdiff_t >(val2); try { result = (swig::SwigPyIterator *)((swig::SwigPyIterator const *)arg1)->operator -(arg2); - } - catch(swig::stop_iteration &_e) { + } catch(swig::stop_iteration &_e) { { (void)_e; SWIG_SetErrorObj(PyExc_StopIteration, SWIG_Py_Void()); SWIG_fail; } } - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN | 0 ); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } -SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; swig::SwigPyIterator *arg2 = 0 ; @@ -7480,7 +7521,9 @@ resultobj = SWIG_From_ptrdiff_t(static_cast< ptrdiff_t >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -7550,7 +7593,7 @@ } -SWIGINTERN PyObject *_wrap_checkVersion__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_checkVersion__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -7583,7 +7626,7 @@ } -SWIGINTERN PyObject *_wrap_checkVersion__SWIG_1(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_checkVersion__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; char *result = 0 ; @@ -7629,7 +7672,7 @@ } -SWIGINTERN int _wrap_new_ClientProfile__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_ClientProfile__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::ClientProfile *result = 0 ; @@ -7651,7 +7694,7 @@ } -SWIGINTERN int _wrap_new_ClientProfile__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_ClientProfile__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -7684,7 +7727,7 @@ } -SWIGINTERN int _wrap_new_ClientProfile__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_ClientProfile__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; prelude_client_profile_t *arg1 = (prelude_client_profile_t *) 0 ; void *argp1 = 0 ; @@ -7714,7 +7757,7 @@ } -SWIGINTERN int _wrap_new_ClientProfile__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_ClientProfile__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::ClientProfile *arg1 = 0 ; void *argp1 = 0 ; @@ -7747,7 +7790,7 @@ } -SWIGINTERN int _wrap_new_ClientProfile(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_ClientProfile(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -8451,7 +8494,7 @@ } -SWIGINTERN int _wrap_new_Connection__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_Connection__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::Connection *result = 0 ; @@ -8477,7 +8520,7 @@ } -SWIGINTERN int _wrap_new_Connection__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_Connection__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -8514,7 +8557,7 @@ } -SWIGINTERN int _wrap_new_Connection__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_Connection__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::Connection *arg1 = 0 ; void *argp1 = 0 ; @@ -8551,7 +8594,7 @@ } -SWIGINTERN int _wrap_new_Connection__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_Connection__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; prelude_connection_t *arg1 = (prelude_connection_t *) 0 ; bool arg2 ; @@ -8593,7 +8636,7 @@ } -SWIGINTERN int _wrap_new_Connection__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_Connection__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; prelude_connection_t *arg1 = (prelude_connection_t *) 0 ; void *argp1 = 0 ; @@ -8627,7 +8670,7 @@ } -SWIGINTERN int _wrap_new_Connection(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_Connection(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[3] = { 0 @@ -9350,7 +9393,7 @@ } -SWIGINTERN int _wrap_new_ConnectionPool__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_ConnectionPool__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::ConnectionPool *result = 0 ; @@ -9376,7 +9419,7 @@ } -SWIGINTERN int _wrap_new_ConnectionPool__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_ConnectionPool__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; prelude_connection_pool_t *arg1 = (prelude_connection_pool_t *) 0 ; void *argp1 = 0 ; @@ -9410,7 +9453,7 @@ } -SWIGINTERN int _wrap_new_ConnectionPool__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_ConnectionPool__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::ConnectionPool *arg1 = 0 ; void *argp1 = 0 ; @@ -9447,7 +9490,7 @@ } -SWIGINTERN int _wrap_new_ConnectionPool__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_ConnectionPool__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::ClientProfile *arg1 = 0 ; int arg2 ; @@ -9492,7 +9535,7 @@ } -SWIGINTERN int _wrap_new_ConnectionPool(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_ConnectionPool(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[3] = { 0 @@ -10110,7 +10153,7 @@ } -SWIGINTERN int _wrap_new_Client__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_Client__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -10147,7 +10190,7 @@ } -SWIGINTERN int _wrap_new_Client__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_Client__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::Client *arg1 = 0 ; void *argp1 = 0 ; @@ -10184,7 +10227,7 @@ } -SWIGINTERN int _wrap_new_Client(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_Client(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -10791,7 +10834,9 @@ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Prelude__Client, 0 | 0 ); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -10838,7 +10883,9 @@ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Prelude__Client, 0 | 0 ); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -11075,7 +11122,7 @@ } -SWIGINTERN int _wrap_new_PreludeLog(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_PreludeLog(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { PyObject *resultobj = 0; Prelude::PreludeLog *result = 0 ; @@ -11159,7 +11206,7 @@ } -SWIGINTERN int _wrap_new_PreludeError__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_PreludeError__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::PreludeError *result = 0 ; @@ -11181,7 +11228,7 @@ } -SWIGINTERN int _wrap_new_PreludeError__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_PreludeError__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; int arg1 ; int val1 ; @@ -11211,7 +11258,7 @@ } -SWIGINTERN int _wrap_new_PreludeError__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_PreludeError__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::string *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -11248,7 +11295,7 @@ } -SWIGINTERN int _wrap_new_PreludeError(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_PreludeError(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -11488,7 +11535,7 @@ SWIGPY_DESTRUCTOR_CLOSURE(_wrap_delete_ClientEasy) /* defines _wrap_delete_ClientEasy_destructor_closure */ -SWIGINTERN int _wrap_new_IDMEFCriterion(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEFCriterion(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { PyObject *resultobj = 0; Prelude::IDMEFCriterion *result = 0 ; @@ -11572,7 +11619,7 @@ } -SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::IDMEFCriteria *result = 0 ; @@ -11594,7 +11641,7 @@ } -SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFCriteria *arg1 = 0 ; void *argp1 = 0 ; @@ -11627,7 +11674,7 @@ } -SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -11660,7 +11707,7 @@ } -SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::string *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -11697,7 +11744,7 @@ } -SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFCriteria__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; idmef_criteria_t *arg1 = (idmef_criteria_t *) 0 ; void *argp1 = 0 ; @@ -11727,7 +11774,7 @@ } -SWIGINTERN int _wrap_new_IDMEFCriteria(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEFCriteria(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -12071,7 +12118,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::IDMEFValue *result = 0 ; @@ -12123,7 +12170,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; void *argp1 = 0 ; @@ -12153,7 +12200,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< Prelude::IDMEF,std::allocator< Prelude::IDMEF > > *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -12190,7 +12237,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFValue *arg1 = 0 ; void *argp1 = 0 ; @@ -12223,7 +12270,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< Prelude::IDMEFValue,std::allocator< Prelude::IDMEFValue > > *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -12260,7 +12307,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_5(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; idmef_value_t *arg1 = (idmef_value_t *) 0 ; void *argp1 = 0 ; @@ -12290,7 +12337,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_6(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::string *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -12327,7 +12374,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_7(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; int32_t arg1 ; int val1 ; @@ -12357,7 +12404,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_8(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_8(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; int64_t arg1 ; long long val1 ; @@ -12387,7 +12434,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_9(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_9(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; uint64_t arg1 ; unsigned long long val1 ; @@ -12417,7 +12464,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_10(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_10(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; float arg1 ; float val1 ; @@ -12447,7 +12494,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_11(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_11(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; double arg1 ; double val1 ; @@ -12477,7 +12524,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue__SWIG_12(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFValue__SWIG_12(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFTime *arg1 = 0 ; void *argp1 = 0 ; @@ -12510,7 +12557,7 @@ } -SWIGINTERN int _wrap_new_IDMEFValue(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEFValue(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -12809,7 +12856,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFValue___eq____SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFValue___eq____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFValue *arg1 = (Prelude::IDMEFValue *) 0 ; std::vector< Prelude::IDMEFValue,std::allocator< Prelude::IDMEFValue > > *arg2 = 0 ; @@ -12850,7 +12897,9 @@ return resultobj; fail: if (SWIG_IsNewObj(res2)) delete arg2; - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -12893,7 +12942,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -12936,7 +12987,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -12979,7 +13032,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -13022,11 +13077,13 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } -SWIGINTERN PyObject *_wrap_IDMEFValue___eq____SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFValue___eq____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFValue *arg1 = (Prelude::IDMEFValue *) 0 ; Prelude::IDMEFValue *arg2 = 0 ; @@ -13063,7 +13120,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -13135,15 +13194,19 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } +SWIGPY_HASHFUNC_CLOSURE(_wrap_IDMEFValue_getType) /* defines _wrap_IDMEFValue_getType_hashfunc_closure */ + SWIGPY_DESTRUCTOR_CLOSURE(_wrap_delete_IDMEFValue) /* defines _wrap_delete_IDMEFValue_destructor_closure */ SWIGPY_REPRFUNC_CLOSURE(_wrap_IDMEFValue_toString) /* defines _wrap_IDMEFValue_toString_reprfunc_closure */ -SWIGINTERN int _wrap_new_IDMEFPath__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFPath__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -13176,7 +13239,7 @@ } -SWIGINTERN int _wrap_new_IDMEFPath__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFPath__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = 0 ; char *arg2 = (char *) 0 ; @@ -13220,7 +13283,7 @@ } -SWIGINTERN int _wrap_new_IDMEFPath__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFPath__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; idmef_path_t *arg1 = (idmef_path_t *) 0 ; void *argp1 = 0 ; @@ -13250,7 +13313,7 @@ } -SWIGINTERN int _wrap_new_IDMEFPath__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFPath__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = 0 ; void *argp1 = 0 ; @@ -13283,7 +13346,7 @@ } -SWIGINTERN int _wrap_new_IDMEFPath(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEFPath(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[3] = { 0 @@ -13362,7 +13425,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13417,7 +13480,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13465,7 +13528,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13520,7 +13583,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13568,7 +13631,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13619,7 +13682,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_5(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13674,7 +13737,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_6(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13722,7 +13785,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_7(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13770,7 +13833,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_8(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_8(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13818,7 +13881,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_9(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_9(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -13866,7 +13929,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_10(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFPath_set__SWIG_10(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = (Prelude::IDMEFPath *) 0 ; Prelude::IDMEF *arg2 = 0 ; @@ -14817,7 +14880,7 @@ SWIGPY_OBJOBJARGPROC_CLOSURE(_wrap_IDMEFPath_set) /* defines _wrap_IDMEFPath_set_objobjargproc_closure */ -SWIGINTERN int _wrap_new_IDMEFTime__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_IDMEFTime__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::IDMEFTime *result = 0 ; @@ -14839,7 +14902,7 @@ } -SWIGINTERN int _wrap_new_IDMEFTime__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFTime__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; idmef_time_t *arg1 = (idmef_time_t *) 0 ; void *argp1 = 0 ; @@ -14869,7 +14932,7 @@ } -SWIGINTERN int _wrap_new_IDMEFTime__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFTime__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; time_t arg1 ; long long val1 ; @@ -14899,7 +14962,7 @@ } -SWIGINTERN int _wrap_new_IDMEFTime__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFTime__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -14932,7 +14995,7 @@ } -SWIGINTERN int _wrap_new_IDMEFTime__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFTime__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; timeval *arg1 = (timeval *) 0 ; void *argp1 = 0 ; @@ -14962,7 +15025,7 @@ } -SWIGINTERN int _wrap_new_IDMEFTime__SWIG_5(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFTime__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFTime *arg1 = 0 ; void *argp1 = 0 ; @@ -14995,7 +15058,7 @@ } -SWIGINTERN int _wrap_new_IDMEFTime(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEFTime(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -15101,7 +15164,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::IDMEFTime *arg1 = (Prelude::IDMEFTime *) 0 ; void *argp1 = 0 ; @@ -15130,7 +15193,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFTime *arg1 = (Prelude::IDMEFTime *) 0 ; time_t *arg2 = (time_t *) 0 ; @@ -15167,7 +15230,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFTime *arg1 = (Prelude::IDMEFTime *) 0 ; char *arg2 = (char *) 0 ; @@ -15207,7 +15270,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFTime_set__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFTime *arg1 = (Prelude::IDMEFTime *) 0 ; timeval *arg2 = (timeval *) 0 ; @@ -15638,7 +15701,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -15683,7 +15748,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -15728,7 +15795,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -15773,7 +15842,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -15818,7 +15889,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -15863,7 +15936,9 @@ resultobj = SWIG_From_bool(static_cast< bool >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -15910,7 +15985,7 @@ SWIGPY_UNARYFUNC_CLOSURE(_wrap_IDMEFTime__getSec2) /* defines _wrap_IDMEFTime__getSec2_unaryfunc_closure */ -SWIGINTERN int _wrap_new_IDMEFClass__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFClass__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; idmef_class_id_t arg1 ; int val1 ; @@ -15940,7 +16015,7 @@ } -SWIGINTERN int _wrap_new_IDMEFClass__SWIG_1(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_IDMEFClass__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::IDMEFClass *result = 0 ; @@ -15962,7 +16037,7 @@ } -SWIGINTERN int _wrap_new_IDMEFClass__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFClass__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFPath *arg1 = 0 ; void *argp1 = 0 ; @@ -15995,7 +16070,7 @@ } -SWIGINTERN int _wrap_new_IDMEFClass__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEFClass__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::string *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -16032,7 +16107,7 @@ } -SWIGINTERN int _wrap_new_IDMEFClass(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEFClass(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -16113,7 +16188,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFClass_get__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFClass_get__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFClass *arg1 = (Prelude::IDMEFClass *) 0 ; int arg2 ; @@ -16151,7 +16226,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEFClass_get__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEFClass_get__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEFClass *arg1 = (Prelude::IDMEFClass *) 0 ; std::string *arg2 = 0 ; @@ -16713,7 +16788,7 @@ } -SWIGINTERN int _wrap_new_IDMEF__SWIG_0(PyObject *self, int nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN int _wrap_new_IDMEF__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; Prelude::IDMEF *result = 0 ; @@ -16735,7 +16810,7 @@ } -SWIGINTERN int _wrap_new_IDMEF__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEF__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; char *arg1 = (char *) 0 ; int res1 ; @@ -16768,7 +16843,7 @@ } -SWIGINTERN int _wrap_new_IDMEF__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEF__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = 0 ; void *argp1 = 0 ; @@ -16801,7 +16876,7 @@ } -SWIGINTERN int _wrap_new_IDMEF__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEF__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; idmef_object_t *arg1 = (idmef_object_t *) 0 ; void *argp1 = 0 ; @@ -16831,7 +16906,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_0(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -16886,7 +16961,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_1(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -16934,7 +17009,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_2(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -16989,7 +17064,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_3(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17044,7 +17119,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17092,7 +17167,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_5(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_5(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17143,7 +17218,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_6(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_6(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17191,7 +17266,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_7(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_7(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17239,7 +17314,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_8(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_8(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17287,7 +17362,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_9(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_9(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17335,7 +17410,7 @@ } -SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_10(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_IDMEF_set__SWIG_10(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; Prelude::IDMEF *arg1 = (Prelude::IDMEF *) 0 ; char *arg2 = (char *) 0 ; @@ -17696,7 +17771,9 @@ resultobj = SWIG_From_int(static_cast< int >(result)); return resultobj; fail: - return NULL; + PyErr_Clear(); + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } @@ -17861,7 +17938,7 @@ } -SWIGINTERN int _wrap_new_IDMEF__SWIG_4(PyObject *self, int nobjs, PyObject **swig_obj) { +SWIGINTERN int _wrap_new_IDMEF__SWIG_4(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; void *arg1 = (void *) 0 ; Prelude::IDMEF *result = 0 ; @@ -17899,7 +17976,7 @@ } -SWIGINTERN int _wrap_new_IDMEF(PyObject *self, PyObject *args) { +SWIGINTERN int _wrap_new_IDMEF(PyObject *self, PyObject *args, PyObject *SWIGUNUSEDPARM(kwargs)) { Py_ssize_t argc; PyObject *argv[2] = { 0 @@ -18253,7 +18330,7 @@ "prelude.SwigPyIterator", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_SwigPyIterator_destructor_closure,/* tp_dealloc */ + _wrap_delete_SwigPyIterator_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -18266,7 +18343,7 @@ &SwigPyBuiltin__swig__SwigPyIterator_type.as_number, /* tp_as_number */ &SwigPyBuiltin__swig__SwigPyIterator_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__swig__SwigPyIterator_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -18280,10 +18357,10 @@ "swig::SwigPyIterator", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__swig__SwigPyIterator_richcompare,/* tp_richcompare */ + SwigPyBuiltin__swig__SwigPyIterator_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ - (getiterfunc) &swig::make_output_iterator_builtin, /* tp_iter */ - (iternextfunc) (iternextfunc) _wrap_SwigPyIterator___next___iternextfunc_closure,/* tp_iternext */ + &swig::make_output_iterator_builtin, /* tp_iter */ + _wrap_SwigPyIterator___next___iternextfunc_closure, /* tp_iternext */ SwigPyBuiltin__swig__SwigPyIterator_methods, /* tp_methods */ 0, /* tp_members */ SwigPyBuiltin__swig__SwigPyIterator_getset, /* tp_getset */ @@ -18291,8 +18368,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) SwigPyBuiltin_BadInit, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + SwigPyBuiltin_BadInit, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -18327,8 +18404,8 @@ }, #endif { - (binaryfunc) (binaryfunc) _wrap_SwigPyIterator___add__, /* nb_add */ - (binaryfunc) (binaryfunc) _wrap_SwigPyIterator___sub___binaryfunc_closure,/* nb_subtract */ + _wrap_SwigPyIterator___add__, /* nb_add */ + _wrap_SwigPyIterator___sub___binaryfunc_closure, /* nb_subtract */ (binaryfunc) 0, /* nb_multiply */ #if PY_VERSION_HEX < 0x03000000 (binaryfunc) 0, /* nb_divide */ @@ -18360,8 +18437,8 @@ (unaryfunc) 0, /* nb_oct */ (unaryfunc) 0, /* nb_hex */ #endif - (binaryfunc) (binaryfunc) _wrap_SwigPyIterator___iadd__, /* nb_inplace_add */ - (binaryfunc) (binaryfunc) _wrap_SwigPyIterator___isub__, /* nb_inplace_subtract */ + _wrap_SwigPyIterator___iadd__, /* nb_inplace_add */ + _wrap_SwigPyIterator___isub__, /* nb_inplace_subtract */ (binaryfunc) 0, /* nb_inplace_multiply */ #if PY_VERSION_HEX < 0x03000000 (binaryfunc) 0, /* nb_inplace_divide */ @@ -18486,7 +18563,7 @@ "prelude.ClientProfile", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_ClientProfile_destructor_closure,/* tp_dealloc */ + _wrap_delete_ClientProfile_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -18499,7 +18576,7 @@ &SwigPyBuiltin__Prelude__ClientProfile_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__ClientProfile_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__ClientProfile_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -18513,7 +18590,7 @@ "Prelude::ClientProfile", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__ClientProfile_richcompare,/* tp_richcompare */ + SwigPyBuiltin__Prelude__ClientProfile_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -18524,8 +18601,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_ClientProfile, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_ClientProfile, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -18718,7 +18795,7 @@ "prelude.Connection", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_Connection_destructor_closure,/* tp_dealloc */ + _wrap_delete_Connection_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -18731,7 +18808,7 @@ &SwigPyBuiltin__Prelude__Connection_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__Connection_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__Connection_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -18745,7 +18822,7 @@ "Prelude::Connection", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__Connection_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__Connection_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -18756,8 +18833,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_Connection, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_Connection, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -18946,7 +19023,7 @@ "prelude.ConnectionPool", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_ConnectionPool_destructor_closure,/* tp_dealloc */ + _wrap_delete_ConnectionPool_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -18959,7 +19036,7 @@ &SwigPyBuiltin__Prelude__ConnectionPool_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__ConnectionPool_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__ConnectionPool_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -18973,7 +19050,7 @@ "Prelude::ConnectionPool", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__ConnectionPool_richcompare,/* tp_richcompare */ + SwigPyBuiltin__Prelude__ConnectionPool_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -18984,8 +19061,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_ConnectionPool, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_ConnectionPool, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -19177,7 +19254,7 @@ "prelude.Client", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_Client_destructor_closure,/* tp_dealloc */ + _wrap_delete_Client_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -19190,7 +19267,7 @@ &SwigPyBuiltin__Prelude__Client_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__Client_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__Client_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -19204,7 +19281,7 @@ "Prelude::Client", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__Client_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__Client_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -19215,8 +19292,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_Client, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_Client, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -19265,8 +19342,8 @@ (unaryfunc) 0, /* nb_absolute */ (inquiry) 0, /* nb_nonzero */ (unaryfunc) 0, /* nb_invert */ - (binaryfunc) (binaryfunc) _wrap_Client___lshift__, /* nb_lshift */ - (binaryfunc) (binaryfunc) _wrap_Client___rshift__, /* nb_rshift */ + _wrap_Client___lshift__, /* nb_lshift */ + _wrap_Client___rshift__, /* nb_rshift */ (binaryfunc) 0, /* nb_and */ (binaryfunc) 0, /* nb_xor */ (binaryfunc) 0, /* nb_or */ @@ -19398,7 +19475,7 @@ "prelude.PreludeLog", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_PreludeLog_destructor_closure,/* tp_dealloc */ + _wrap_delete_PreludeLog_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -19411,7 +19488,7 @@ &SwigPyBuiltin__Prelude__PreludeLog_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__PreludeLog_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__PreludeLog_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -19425,7 +19502,7 @@ "Prelude::PreludeLog", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__PreludeLog_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__PreludeLog_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -19436,8 +19513,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_PreludeLog, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_PreludeLog, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -19615,7 +19692,7 @@ "prelude.PreludeError", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_PreludeError_destructor_closure,/* tp_dealloc */ + _wrap_delete_PreludeError_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -19628,9 +19705,9 @@ &SwigPyBuiltin__Prelude__PreludeError_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__PreludeError_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__PreludeError_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ - (reprfunc) (reprfunc) _wrap_PreludeError_what_reprfunc_closure,/* tp_str */ + _wrap_PreludeError_what_reprfunc_closure, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ (setattrofunc) 0, /* tp_setattro */ &SwigPyBuiltin__Prelude__PreludeError_type.as_buffer, /* tp_as_buffer */ @@ -19642,7 +19719,7 @@ "Prelude::PreludeError", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__PreludeError_richcompare,/* tp_richcompare */ + SwigPyBuiltin__Prelude__PreludeError_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -19653,8 +19730,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_PreludeError, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_PreludeError, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -19830,7 +19907,7 @@ "prelude.ClientEasy", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_ClientEasy_destructor_closure,/* tp_dealloc */ + _wrap_delete_ClientEasy_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -19843,7 +19920,7 @@ &SwigPyBuiltin__Prelude__ClientEasy_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__ClientEasy_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__ClientEasy_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -19857,7 +19934,7 @@ "Prelude::ClientEasy", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__ClientEasy_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__ClientEasy_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -19868,8 +19945,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_ClientEasy, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_ClientEasy, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -20045,7 +20122,7 @@ "prelude.IDMEFCriterion", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEFCriterion_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEFCriterion_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -20058,7 +20135,7 @@ &SwigPyBuiltin__Prelude__IDMEFCriterion_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEFCriterion_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEFCriterion_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -20072,7 +20149,7 @@ "Prelude::IDMEFCriterion", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEFCriterion_richcompare,/* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEFCriterion_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -20083,8 +20160,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEFCriterion, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEFCriterion, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -20266,7 +20343,7 @@ "prelude.IDMEFCriteria", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEFCriteria_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEFCriteria_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -20275,11 +20352,11 @@ #else (cmpfunc) 0, /* tp_compare */ #endif - (reprfunc) (reprfunc) _wrap_IDMEFCriteria_toString_reprfunc_closure,/* tp_repr */ + _wrap_IDMEFCriteria_toString_reprfunc_closure, /* tp_repr */ &SwigPyBuiltin__Prelude__IDMEFCriteria_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEFCriteria_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEFCriteria_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -20293,7 +20370,7 @@ "Prelude::IDMEFCriteria", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEFCriteria_richcompare,/* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEFCriteria_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -20304,8 +20381,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEFCriteria, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEFCriteria, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -20501,7 +20578,7 @@ "prelude.IDMEFValue", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEFValue_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEFValue_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -20510,11 +20587,11 @@ #else (cmpfunc) 0, /* tp_compare */ #endif - (reprfunc) (reprfunc) _wrap_IDMEFValue_toString_reprfunc_closure,/* tp_repr */ + _wrap_IDMEFValue_toString_reprfunc_closure, /* tp_repr */ &SwigPyBuiltin__Prelude__IDMEFValue_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEFValue_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEFValue_type.as_mapping, /* tp_as_mapping */ - (hashfunc) _wrap_IDMEFValue_getType, /* tp_hash */ + _wrap_IDMEFValue_getType_hashfunc_closure,/* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -20528,7 +20605,7 @@ "Prelude::IDMEFValue", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEFValue_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEFValue_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -20539,8 +20616,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEFValue, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEFValue, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -20735,7 +20812,7 @@ "prelude.IDMEFPath", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEFPath_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEFPath_destructor_closure,/* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -20748,7 +20825,7 @@ &SwigPyBuiltin__Prelude__IDMEFPath_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEFPath_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEFPath_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -20762,7 +20839,7 @@ "Prelude::IDMEFPath", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEFPath_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEFPath_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -20773,8 +20850,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEFPath, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEFPath, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -20869,8 +20946,8 @@ }, { (lenfunc) 0, /* mp_length */ - (binaryfunc) (binaryfunc) _wrap_IDMEFPath_get, /* mp_subscript */ - (objobjargproc) (objobjargproc) _wrap_IDMEFPath_set_objobjargproc_closure,/* mp_ass_subscript */ + _wrap_IDMEFPath_get, /* mp_subscript */ + _wrap_IDMEFPath_set_objobjargproc_closure,/* mp_ass_subscript */ }, { (lenfunc) 0, /* sq_length */ @@ -20976,7 +21053,7 @@ "prelude.IDMEFTime", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEFTime_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEFTime_destructor_closure,/* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -20985,11 +21062,11 @@ #else (cmpfunc) 0, /* tp_compare */ #endif - (reprfunc) (reprfunc) _wrap_IDMEFTime_toString_reprfunc_closure,/* tp_repr */ + _wrap_IDMEFTime_toString_reprfunc_closure,/* tp_repr */ &SwigPyBuiltin__Prelude__IDMEFTime_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEFTime_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEFTime_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -21003,7 +21080,7 @@ "Prelude::IDMEFTime", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEFTime_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEFTime_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -21014,8 +21091,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEFTime, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEFTime, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -21072,13 +21149,13 @@ #if PY_VERSION_HEX < 0x03000000 (coercion) 0, /* nb_coerce */ #endif - (unaryfunc) (unaryfunc) _wrap_IDMEFTime_getSec_unaryfunc_closure,/* nb_int */ + _wrap_IDMEFTime_getSec_unaryfunc_closure, /* nb_int */ #if PY_VERSION_HEX >= 0x03000000 (void *) 0, /* nb_reserved */ #else - (unaryfunc) (unaryfunc) _wrap_IDMEFTime__getSec2_unaryfunc_closure,/* nb_long */ + _wrap_IDMEFTime__getSec2_unaryfunc_closure, /* nb_long */ #endif - (unaryfunc) (unaryfunc) _wrap_IDMEFTime_getTime_unaryfunc_closure,/* nb_float */ + _wrap_IDMEFTime_getTime_unaryfunc_closure,/* nb_float */ #if PY_VERSION_HEX < 0x03000000 (unaryfunc) 0, /* nb_oct */ (unaryfunc) 0, /* nb_hex */ @@ -21111,7 +21188,7 @@ { (lenfunc) 0, /* mp_length */ (binaryfunc) 0, /* mp_subscript */ - (objobjargproc) (objobjargproc) _wrap_IDMEFTime_set_objobjargproc_closure,/* mp_ass_subscript */ + _wrap_IDMEFTime_set_objobjargproc_closure,/* mp_ass_subscript */ }, { (lenfunc) 0, /* sq_length */ @@ -21204,7 +21281,7 @@ "prelude.IDMEFClass", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEFClass_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEFClass_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -21213,13 +21290,13 @@ #else (cmpfunc) 0, /* tp_compare */ #endif - (reprfunc) (reprfunc) _wrap_IDMEFClass_toString_reprfunc_closure,/* tp_repr */ + _wrap_IDMEFClass_toString_reprfunc_closure, /* tp_repr */ &SwigPyBuiltin__Prelude__IDMEFClass_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEFClass_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEFClass_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ - (reprfunc) (reprfunc) _wrap_IDMEFClass_getName_reprfunc_closure,/* tp_str */ + _wrap_IDMEFClass_getName_reprfunc_closure,/* tp_str */ (getattrofunc) 0, /* tp_getattro */ (setattrofunc) 0, /* tp_setattro */ &SwigPyBuiltin__Prelude__IDMEFClass_type.as_buffer, /* tp_as_buffer */ @@ -21231,7 +21308,7 @@ "Prelude::IDMEFClass", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEFClass_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEFClass_richcompare, /* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -21242,8 +21319,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEFClass, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEFClass, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -21337,15 +21414,15 @@ #endif }, { - (lenfunc) (lenfunc) _wrap_IDMEFClass_getChildCount_lenfunc_closure,/* mp_length */ - (binaryfunc) (binaryfunc) _wrap_IDMEFClass_get_binaryfunc_closure,/* mp_subscript */ + _wrap_IDMEFClass_getChildCount_lenfunc_closure, /* mp_length */ + _wrap_IDMEFClass_get_binaryfunc_closure, /* mp_subscript */ (objobjargproc) 0, /* mp_ass_subscript */ }, { (lenfunc) 0, /* sq_length */ (binaryfunc) 0, /* sq_concat */ (ssizeargfunc) 0, /* sq_repeat */ - (ssizeargfunc) (ssizeargfunc) _wrap_IDMEFClass__get2_ssizeargfunc_closure,/* sq_item */ + _wrap_IDMEFClass__get2_ssizeargfunc_closure, /* sq_item */ #if PY_VERSION_HEX >= 0x03000000 (void *) 0, /* was_sq_slice */ #else @@ -21436,7 +21513,7 @@ "prelude.IDMEF", /* tp_name */ sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ - (destructor) (destructor) _wrap_delete_IDMEF_destructor_closure,/* tp_dealloc */ + _wrap_delete_IDMEF_destructor_closure, /* tp_dealloc */ (printfunc) 0, /* tp_print */ (getattrfunc) 0, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ @@ -21445,11 +21522,11 @@ #else (cmpfunc) 0, /* tp_compare */ #endif - (reprfunc) (reprfunc) _wrap_IDMEF_toString_reprfunc_closure, /* tp_repr */ + _wrap_IDMEF_toString_reprfunc_closure, /* tp_repr */ &SwigPyBuiltin__Prelude__IDMEF_type.as_number, /* tp_as_number */ &SwigPyBuiltin__Prelude__IDMEF_type.as_sequence, /* tp_as_sequence */ &SwigPyBuiltin__Prelude__IDMEF_type.as_mapping, /* tp_as_mapping */ - (hashfunc) SwigPyObject_hash, /* tp_hash */ + SwigPyObject_hash, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ (reprfunc) 0, /* tp_str */ (getattrofunc) 0, /* tp_getattro */ @@ -21463,7 +21540,7 @@ "Prelude::IDMEF", /* tp_doc */ (traverseproc) 0, /* tp_traverse */ (inquiry) 0, /* tp_clear */ - (richcmpfunc) SwigPyBuiltin__Prelude__IDMEF_richcompare, /* tp_richcompare */ + SwigPyBuiltin__Prelude__IDMEF_richcompare,/* tp_richcompare */ 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ @@ -21474,8 +21551,8 @@ 0, /* tp_dict */ (descrgetfunc) 0, /* tp_descr_get */ (descrsetfunc) 0, /* tp_descr_set */ - (Py_ssize_t) offsetof(SwigPyObject, dict),/* tp_dictoffset */ - (initproc) _wrap_new_IDMEF, /* tp_init */ + offsetof(SwigPyObject, dict), /* tp_dictoffset */ + _wrap_new_IDMEF, /* tp_init */ (allocfunc) 0, /* tp_alloc */ (newfunc) 0, /* tp_new */ (freefunc) 0, /* tp_free */ @@ -21524,8 +21601,8 @@ (unaryfunc) 0, /* nb_absolute */ (inquiry) 0, /* nb_nonzero */ (unaryfunc) 0, /* nb_invert */ - (binaryfunc) _wrap_IDMEF_readExcept, /* nb_lshift */ - (binaryfunc) _wrap_IDMEF_write, /* nb_rshift */ + _wrap_IDMEF_readExcept, /* nb_lshift */ + _wrap_IDMEF_write, /* nb_rshift */ (binaryfunc) 0, /* nb_and */ (binaryfunc) 0, /* nb_xor */ (binaryfunc) 0, /* nb_or */ @@ -21570,8 +21647,8 @@ }, { (lenfunc) 0, /* mp_length */ - (binaryfunc) (binaryfunc) _wrap_IDMEF_get,/* mp_subscript */ - (objobjargproc) (objobjargproc) _wrap_IDMEF_set_objobjargproc_closure,/* mp_ass_subscript */ + _wrap_IDMEF_get, /* mp_subscript */ + _wrap_IDMEF_set_objobjargproc_closure, /* mp_ass_subscript */ }, { (lenfunc) 0, /* sq_length */ @@ -21589,7 +21666,7 @@ #else (ssizessizeobjargproc) 0, /* sq_ass_slice */ #endif - (objobjproc) _wrap_IDMEF___contains___closure, /* sq_contains */ + _wrap_IDMEF___contains___closure, /* sq_contains */ (binaryfunc) 0, /* sq_inplace_concat */ (ssizeargfunc) 0, /* sq_inplace_repeat */ }, @@ -22136,10 +22213,10 @@ SWIGINTERN int swig_varlink_print(swig_varlinkobject *v, FILE *fp, int SWIGUNUSEDPARM(flags)) { - char *tmp; PyObject *str = swig_varlink_str(v); + const char *tmp = SWIG_Python_str_AsChar(str); fprintf(fp,"Swig global variables "); - fprintf(fp,"%s\n", tmp = SWIG_Python_str_AsChar(str)); + fprintf(fp,"%s\n", tmp ? tmp : "Invalid global variable"); SWIG_Python_str_DelForPy3(tmp); Py_DECREF(str); return 0;