iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

modpython: move CPyRetString to own header.

Browse Source 
It was defined twice: in modpython.cpp, and in modpython.i
And there is a fake CPyRetString in modpython.i

Now both places which use real CPyRetString include the file instead.
Fake CPyRetString is still in modpython.i
This commit is contained in:
Alexey Sokolov
2011-03-31 20:10:24 +07:00
parent ba915eb9c4
commit b8043c3aac
3 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/modpython/modpython.i
View File

@@ -28,15 +28,7 @@
#include "../FileUtils.h"
#include "modpython/module.h"
class CPyRetString {
public:
CString& s;
CPyRetString(CString& S) : s(S) {}
static PyObject* wrap(CString& S) {
CPyRetString* x = new CPyRetString(S);
return SWIG_NewInstanceObj(x, SWIG_TypeQuery("CPyRetString*"), SWIG_POINTER_OWN);
}
};
#include "modpython/retstring.h"
#define stat struct stat
using std::allocator;
@@ -61,21 +53,6 @@ namespace std {
%include "modpython/cstring.i"
%template(_stringlist) std::list<CString>;
/*%typemap(out) std::list<CString> {
std::list<CString>::const_iterator i;
unsigned int j;
int len = $1.size();
SV **svs = new SV*[len];
for (i=$1.begin(), j=0; i!=$1.end(); i++, j++) {
svs[j] = sv_newmortal();
SwigSvFromString(svs[j], *i);
}
AV *myav = av_make(len, svs);
delete[] svs;
$result = newRV_noinc((SV*) myav);
sv_2mortal($result);
argvi++;
}*/
%typemap(out) CModules::ModDirList %{
$result = PyList_New($1.size());