From 757ba2bee7302c49af9bae13b2a156bec52074a7 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 25 Jul 2015 22:44:07 +0200 Subject: [PATCH 1/3] ZNC 1.6.1-rc1 --- configure.ac | 2 +- include/znc/version.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2c252581..90fc5df3 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with main.h! -AC_INIT([znc], [1.6.x]) +AC_INIT([znc], [1.6.1-rc1]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/version.h b/include/znc/version.h index 14d7bf16..e5135f7b 100644 --- a/include/znc/version.h +++ b/include/znc/version.h @@ -4,9 +4,9 @@ // The following defines are for #if comparison (preprocessor only likes ints) #define VERSION_MAJOR 1 #define VERSION_MINOR 6 -#define VERSION_PATCH -1 +#define VERSION_PATCH 1 // This one is for display purpose -#define VERSION_STR "1.6.x" +#define VERSION_STR "1.6.1-rc1" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0) From aa6e7e7428473b5bf5a4cca31fc3b0b1afcd8efd Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 3 Aug 2015 23:59:17 +0100 Subject: [PATCH 2/3] Increase the version number to 1.6.1 --- ChangeLog.md | 43 +++++++++++++++++++++++++++++++++++++++++++ configure.ac | 2 +- include/znc/version.h | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index b098dff1..42644ad4 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,46 @@ +# ZNC 1.6.1 (2015-08-04) + +## Fixes + +* Fixed the problem that channels were no longer removed from the config despite of chansaver being loaded. +* Fixed query buffer size for users who have the default channel buffer size set to 0. +* Fixed a startup failure when simple_away was loaded after awaynick. +* Fixed channel matching commands, such as DETACH, to be case insensitive. +* Specified the required compiler versions in the configure script. +* Fixed a rare conflict of HTTP-Basic auth and cookies. +* Hid local IP address from the 404 page. +* Fixed a build failure for users who have `-Werror=missing-declarations` in their `CXXFLAGS`. +* Fixed `CXXFLAGS=-DVERSION_EXTRA="foo"` which is used by some distros to package ZNC. +* Fixed `znc-buildmod` on Cygwin. + +## Modules + +* chansaver: + * Fixed random loading behavior due to an uninitialized member variable. +* modpython: + * Fixed access to `CUser::GetUserClients()` and `CUser::GetAllClients()`. +* sasl: + * Improved help texts for the SET and REQUIREAUTH commands. +* savebuff: + * Fixed periodical writes on the disk when the module is loaded after startup. +* webadmin: + * Fixed module checkboxes not to claim that all networks/users have loaded a module when there are no networks/users. + * Added an explanation that ZNC was built without ICU support, when encoding settings are disabled for that reason. + * Improved the breadcrumbs. + * Mentioned ExpandString in CTCP replies. + * Added an explanation how to delete port which is used to access webadmin. + +## Internal + +* Fixed `CThreadPool` destructor to handle spurious wakeups. +* Fixed `make distclean` to remove `zncconfig.h`. +* Improved the error message about `--datadir`. +* Fixed a compilation warning when `HAVE_LIBSSL` is not defined. +* Fixed 'comparision' typos in CString documentation. +* Added a non-minified version of the jQuery source code to make Linux distributions (Debian) happy, even though the jQuery license does not require this. + + + # ZNC 1.6.0 (2015-02-12) ## New diff --git a/configure.ac b/configure.ac index 90fc5df3..36ced1aa 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62 AC_PREREQ([2.62]) dnl Keep the version number in sync with main.h! -AC_INIT([znc], [1.6.1-rc1]) +AC_INIT([znc], [1.6.1]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/znc.cpp]) AC_LANG([C++]) diff --git a/include/znc/version.h b/include/znc/version.h index e5135f7b..ac0ce2e2 100644 --- a/include/znc/version.h +++ b/include/znc/version.h @@ -6,7 +6,7 @@ #define VERSION_MINOR 6 #define VERSION_PATCH 1 // This one is for display purpose -#define VERSION_STR "1.6.1-rc1" +#define VERSION_STR "1.6.1" // This one is for ZNCModInfo #define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0) From b8330296a292e236d71e32b228bc1fef1c67b5a7 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Tue, 4 Aug 2015 23:40:50 +0100 Subject: [PATCH 3/3] Fix memory leak in modpython. Update typemaps for CString from latest SWIG. The relevant change is "free p;" -> "delete p;" CString object itself was deleted, but its destructor wasn't called, so it couldn't free the underlying character data. Fix #1017 --- modules/modpython/cstring.i | 213 +++++++++++++++++------------------- 1 file changed, 98 insertions(+), 115 deletions(-) diff --git a/modules/modpython/cstring.i b/modules/modpython/cstring.i index 16ea53da..bc081f7e 100644 --- a/modules/modpython/cstring.i +++ b/modules/modpython/cstring.i @@ -1,33 +1,35 @@ /* SWIG-generated sources are used here. + + This file is generated using: + echo '%include ' > foo.i + swig -python -py3 -c++ -shadow -E foo.i > string.i + Remove unrelated stuff from top of file which is included by default + s/std::string/CString/g + s/std_string/CString/g */ // // String // -%{ -#include -%} +%fragment(""); %feature("naturalvar") CString; -class CString { -public: -typedef size_t size_type; -}; +class CString; -/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,74,%typemaps_std_string@*/ +/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,70,%typemaps_CString@*/ -/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,4,%std_string_asptr@*/ +/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,4,%CString_asptr@*/ %fragment("SWIG_" "AsPtr" "_" {CString},"header",fragment="SWIG_AsCharPtrAndSize") { SWIGINTERN int -SWIG_AsPtr_std_string (PyObject * obj, CString **val) +SWIG_AsPtr_CString (PyObject * obj, CString **val) { char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ; if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) { if (buf) { if (val) *val = new CString(buf, size - 1); - if (alloc == SWIG_NEWOBJ) free((char*)buf); + if (alloc == SWIG_NEWOBJ) delete[] buf; return SWIG_NEWOBJ; } else { if (val) *val = 0; @@ -51,18 +53,18 @@ SWIG_AsPtr_std_string (PyObject * obj, CString **val) } } /*@SWIG@*/ -/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,52,%std_string_asval@*/ +/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,48,%CString_asval@*/ %fragment("SWIG_" "AsVal" "_" {CString},"header", fragment="SWIG_" "AsPtr" "_" {CString}) { SWIGINTERN int -SWIG_AsVal_std_string (PyObject * obj, CString *val) +SWIG_AsVal_CString (PyObject * obj, CString *val) { CString* v = (CString *) 0; - int res = SWIG_AsPtr_std_string (obj, &v); + int res = SWIG_AsPtr_CString (obj, &v); if (!SWIG_IsOK(res)) return res; if (v) { if (val) *val = *v; if (SWIG_IsNewObj(res)) { - free((char*)v); + delete v; res = SWIG_DelNewMask(res); } return res; @@ -71,45 +73,30 @@ SWIG_AsVal_std_string (PyObject * obj, CString *val) } } /*@SWIG@*/ -/*@SWIG:/usr/share/swig1.3/typemaps/std_strings.swg,38,%std_string_from@*/ -%fragment("SWIG_" "From" "_" {CString},"header",fragment="SWIG_FromCharPtrAndSize",fragment="StdTraits") { +/*@SWIG:/swig/3.0.8/typemaps/CStrings.swg,38,%CString_from@*/ +%fragment("SWIG_" "From" "_" {CString},"header",fragment="SWIG_FromCharPtrAndSize") { SWIGINTERNINLINE PyObject * -SWIG_From_std_string (const CString& s) +SWIG_From_CString (const CString& s) { - if (s.size()) { - return SWIG_FromCharPtrAndSize(s.data(), s.size()); - } else { - return SWIG_FromCharPtrAndSize(s.c_str(), 0); - } + return SWIG_FromCharPtrAndSize(s.data(), s.size()); } } /*@SWIG@*/ -%fragment("StdTraitsCString","header",fragment="SWIG_From_CString") { - namespace swig { - template<> struct traits_from { - static PyObject *from(const CString& s) { - return SWIG_From_std_string(s); - } - }; - } -} - - -/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,204,%typemaps_asptrfromn@*/ -/*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,193,%typemaps_asptrfrom@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,163,%typemaps_asptr@*/ +/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,201,%typemaps_asptrfromn@*/ +/*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,190,%typemaps_asptrfrom@*/ + /*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,160,%typemaps_asptr@*/ %fragment("SWIG_" "AsVal" "_" {CString},"header",fragment="SWIG_" "AsPtr" "_" {CString}) { SWIGINTERNINLINE int - SWIG_AsVal_std_string (PyObject * obj, CString *val) + SWIG_AsVal_CString (PyObject * obj, CString *val) { CString *v = (CString *)0; - int res = SWIG_AsPtr_std_string (obj, &v); + int res = SWIG_AsPtr_CString (obj, &v); if (!SWIG_IsOK(res)) return res; if (v) { if (val) *val = *v; if (SWIG_IsNewObj(res)) { - free((char*)v); + delete v; res = SWIG_DelNewMask(res); } return res; @@ -117,67 +104,67 @@ SWIG_From_std_string (const CString& s) return SWIG_ERROR; } } - /*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,31,%ptr_in_typemap@*/ - %typemap(in,fragment="SWIG_" "AsPtr" "_" {CString},fragment="StdTraitsCString") CString { + /*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,28,%ptr_in_typemap@*/ + %typemap(in,fragment="SWIG_" "AsPtr" "_" {CString}) CString { CString *ptr = (CString *)0; - int res = SWIG_AsPtr_std_string($input, &ptr); - if (!SWIG_IsOK(res) || !ptr) { - SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); + int res = SWIG_AsPtr_CString($input, &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); } $1 = *ptr; - if (SWIG_IsNewObj(res)) free((char*)ptr); + if (SWIG_IsNewObj(res)) delete ptr; } %typemap(freearg) CString ""; %typemap(in,fragment="SWIG_" "AsPtr" "_" {CString}) const CString & (int res = SWIG_OLDOBJ) { CString *ptr = (CString *)0; - res = SWIG_AsPtr_std_string($input, &ptr); + res = SWIG_AsPtr_CString($input, &ptr); if (!SWIG_IsOK(res)) { SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); } if (!ptr) { SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); } $1 = ptr; } %typemap(freearg,noblock=1) const CString & { - if (SWIG_IsNewObj(res$argnum)) free((char*)$1); + if (SWIG_IsNewObj(res$argnum)) delete $1; } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,56,%ptr_varin_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,53,%ptr_varin_typemap@*/ %typemap(varin,fragment="SWIG_" "AsPtr" "_" {CString}) CString { CString *ptr = (CString *)0; - int res = SWIG_AsPtr_std_string($input, &ptr); - if (!SWIG_IsOK(res) || !ptr) { - SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in variable '""$name""' of type '""$type""'"); + int res = SWIG_AsPtr_CString($input, &ptr); + if (!SWIG_IsOK(res) || !ptr) { + SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in variable '""$name""' of type '""$type""'"); } $1 = *ptr; - if (SWIG_IsNewObj(res)) free((char*)ptr); + if (SWIG_IsNewObj(res)) delete ptr; } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,71,%ptr_directorout_typemap@*/ - %typemap(directorargout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *DIRECTOROUT ($*ltype temp) { + /*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,68,%ptr_directorout_typemap@*/ + %typemap(directorargout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *DIRECTOROUT ($*ltype temp, int swig_ores) { CString *swig_optr = 0; - int swig_ores = $input ? SWIG_AsPtr_std_string($input, &swig_optr) : 0; - if (!SWIG_IsOK(swig_ores) || !swig_optr) { + swig_ores = $result ? SWIG_AsPtr_CString($result, &swig_optr) : 0; + if (!SWIG_IsOK(swig_ores) || !swig_optr) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""$type""'"); } temp = *swig_optr; - $result = &temp; - if (SWIG_IsNewObj(swig_ores)) free((char*)swig_optr); + $1 = &temp; + if (SWIG_IsNewObj(swig_ores)) delete swig_optr; } %typemap(directorout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString { CString *swig_optr = 0; - int swig_ores = SWIG_AsPtr_std_string($input, &swig_optr); - if (!SWIG_IsOK(swig_ores) || !swig_optr) { + int swig_ores = SWIG_AsPtr_CString($input, &swig_optr); + if (!SWIG_IsOK(swig_ores) || !swig_optr) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""$type""'"); } $result = *swig_optr; - if (SWIG_IsNewObj(swig_ores)) free((char*)swig_optr); + if (SWIG_IsNewObj(swig_ores)) delete swig_optr; } %typemap(directorout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString},warning= "473:Returning a pointer or reference in a director method is not recommended." ) CString* { CString *swig_optr = 0; - int swig_ores = SWIG_AsPtr_std_string($input, &swig_optr); - if (!SWIG_IsOK(swig_ores)) { + int swig_ores = SWIG_AsPtr_CString($input, &swig_optr); + if (!SWIG_IsOK(swig_ores)) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_ores)), "in output value of type '""$type""'"); - } + } $result = swig_optr; if (SWIG_IsNewObj(swig_ores)) { swig_acquire_ownership(swig_optr); @@ -192,14 +179,14 @@ SWIG_From_std_string (const CString& s) %typemap(directorout,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString},warning= "473:Returning a pointer or reference in a director method is not recommended." ) CString& { CString *swig_optr = 0; - int swig_ores = SWIG_AsPtr_std_string($input, &swig_optr); - if (!SWIG_IsOK(swig_ores)) { + int swig_ores = SWIG_AsPtr_CString($input, &swig_optr); + if (!SWIG_IsOK(swig_ores)) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_ores)), "in output value of type '""$type""'"); } else { - if (!swig_optr) { + if (!swig_optr) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ValueError), "invalid null reference " "in output value of type '""$type""'"); - } - } + } + } $result = swig_optr; if (SWIG_IsNewObj(swig_ores)) { swig_acquire_ownership(swig_optr); @@ -216,88 +203,88 @@ SWIG_From_std_string (const CString& s) %typemap(directorout,fragment="SWIG_" "AsPtr" "_" {CString}) CString &DIRECTOROUT = CString /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/ptrtypes.swg,146,%ptr_typecheck_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/ptrtypes.swg,143,%ptr_typecheck_typemap@*/ %typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString * { - int res = SWIG_AsPtr_std_string($input, (CString**)(0)); + int res = SWIG_AsPtr_CString($input, (CString**)(0)); $1 = SWIG_CheckState(res); } -%typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString, const CString& { - int res = SWIG_AsPtr_std_string($input, (CString**)(0)); +%typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString, const CString& { + int res = SWIG_AsPtr_CString($input, (CString**)(0)); $1 = SWIG_CheckState(res); } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,254,%ptr_input_typemap@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,117,%_ptr_input_typemap@*/ - %typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *INPUT(int res = 0) { - res = SWIG_AsPtr_std_string($input, &$1); + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,254,%ptr_input_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,117,%_ptr_input_typemap@*/ + %typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString *INPUT(int res = 0) { + res = SWIG_AsPtr_CString($input, &$1); if (!SWIG_IsOK(res)) { SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); } res = SWIG_AddTmpMask(res); } - %typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString &INPUT(int res = 0) { - res = SWIG_AsPtr_std_string($input, &$1); - if (!SWIG_IsOK(res)) { + %typemap(in,noblock=1,fragment="SWIG_" "AsPtr" "_" {CString}) CString &INPUT(int res = 0) { + res = SWIG_AsPtr_CString($input, &$1); + if (!SWIG_IsOK(res)) { SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); - } - if (!$1) { + } + if (!$1) { SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "$symname" "', argument " "$argnum"" of type '" "$type""'"); } res = SWIG_AddTmpMask(res); } %typemap(freearg,noblock=1,match="in") CString *INPUT, CString &INPUT { - if (SWIG_IsNewObj(res$argnum)) free((char*)$1); + if (SWIG_IsNewObj(res$argnum)) delete $1; } %typemap(typecheck,noblock=1,precedence=135,fragment="SWIG_" "AsPtr" "_" {CString}) CString *INPUT, CString &INPUT { - int res = SWIG_AsPtr_std_string($input, (CString**)0); + int res = SWIG_AsPtr_CString($input, (CString**)0); $1 = SWIG_CheckState(res); } /*@SWIG@*/ /*@SWIG@*/; /*@SWIG@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,184,%typemaps_from@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,55,%value_out_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,183,%typemaps_from@*/ + /*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,55,%value_out_typemap@*/ %typemap(out,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString, const CString { - $result = SWIG_From_std_string((CString)($1)); + $result = SWIG_From_CString(static_cast< CString >($1)); } %typemap(out,noblock=1,fragment="SWIG_" "From" "_" {CString}) const CString& { - $result = SWIG_From_std_string((CString)(*$1)); + $result = SWIG_From_CString(static_cast< CString >(*$1)); } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,79,%value_varout_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,79,%value_varout_typemap@*/ %typemap(varout,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString, const CString& { - $result = SWIG_From_std_string((CString)($1)); + $result = SWIG_From_CString(static_cast< CString >($1)); } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,87,%value_constcode_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,87,%value_constcode_typemap@*/ %typemap(constcode,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString { - SWIG_Python_SetConstant(d, "$symname",SWIG_From_std_string((CString)($value))); + SWIG_Python_SetConstant(d, "$symname",SWIG_From_CString(static_cast< CString >($value))); } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,98,%value_directorin_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,98,%value_directorin_typemap@*/ %typemap(directorin,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString *DIRECTORIN { - $input = SWIG_From_std_string((CString)(*$1_name)); + $input = SWIG_From_CString(static_cast< CString >(*$1)); } %typemap(directorin,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString, const CString& { - $input = SWIG_From_std_string((CString)($1_name)); + $input = SWIG_From_CString(static_cast< CString >($1)); } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/valtypes.swg,154,%value_throws_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/valtypes.swg,153,%value_throws_typemap@*/ %typemap(throws,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString { - SWIG_Python_Raise(SWIG_From_std_string((CString)($1)), "$type", 0); SWIG_fail; + SWIG_Python_Raise(SWIG_From_CString(static_cast< CString >($1)), "$type", 0); SWIG_fail; } /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,258,%value_output_typemap@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,175,%_value_output_typemap@*/ - %typemap(in,numinputs=0,noblock=1) - CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ), + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,258,%value_output_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,175,%_value_output_typemap@*/ + %typemap(in,numinputs=0,noblock=1) + CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ), CString &OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ) { $1 = &temp; } %typemap(argout,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString *OUTPUT, CString &OUTPUT { if (SWIG_IsTmpObj(res$argnum)) { - $result = SWIG_Python_AppendOutput($result, SWIG_From_std_string((*$1))); + $result = SWIG_Python_AppendOutput($result, SWIG_From_CString((*$1))); } else { int new_flags = SWIG_IsNewObj(res$argnum) ? (SWIG_POINTER_OWN | 0 ) : 0 ; $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)($1), $1_descriptor, new_flags)); @@ -306,16 +293,16 @@ SWIG_From_std_string (const CString& s) /*@SWIG@*/ /*@SWIG@*/; /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,258,%value_output_typemap@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,175,%_value_output_typemap@*/ - %typemap(in,numinputs=0,noblock=1) - CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ), + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,258,%value_output_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,175,%_value_output_typemap@*/ + %typemap(in,numinputs=0,noblock=1) + CString *OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ), CString &OUTPUT ($*1_ltype temp, int res = SWIG_TMPOBJ) { $1 = &temp; } %typemap(argout,noblock=1,fragment="SWIG_" "From" "_" {CString}) CString *OUTPUT, CString &OUTPUT { if (SWIG_IsTmpObj(res$argnum)) { - $result = SWIG_Python_AppendOutput($result, SWIG_From_std_string((*$1))); + $result = SWIG_Python_AppendOutput($result, SWIG_From_CString((*$1))); } else { int new_flags = SWIG_IsNewObj(res$argnum) ? (SWIG_POINTER_OWN | 0 ) : 0 ; $result = SWIG_Python_AppendOutput($result, SWIG_NewPointerObj((void*)($1), $1_descriptor, new_flags)); @@ -323,8 +310,8 @@ SWIG_From_std_string (const CString& s) } /*@SWIG@*/ /*@SWIG@*/; - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,240,%_ptr_inout_typemap@*/ - /*@SWIG:/usr/share/swig1.3/typemaps/inoutlist.swg,230,%_value_inout_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,240,%_ptr_inout_typemap@*/ + /*@SWIG:/swig/3.0.8/typemaps/inoutlist.swg,230,%_value_inout_typemap@*/ %typemap(in) CString *INOUT = CString *INPUT; %typemap(in) CString &INOUT = CString &INPUT; %typemap(typecheck) CString *INOUT = CString *INPUT; @@ -337,9 +324,5 @@ SWIG_From_std_string (const CString& s) %typemap(freearg) CString *INOUT = CString *INPUT; %typemap(freearg) CString &INOUT = CString &INPUT; /*@SWIG@*/; -/*@SWIG@*/; -/*@SWIG@*/; - -/*@SWIG@*/; - +/*@SWIG@*/