jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2009-sploving@12011 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Baozeng Ding 2010-05-06 07:08:16 +00:00
commit 75d2abfddb
21 changed files with 466 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/r/rfragments.swg
View file

@ -122,7 +122,7 @@ SWIGINTERN int
SWIG_AsCharPtrAndSize(SEXP obj, char** cptr, size_t* psize, int *alloc)
{
if (cptr && Rf_isString(obj)) {
const char *cstr = CHAR(STRING_ELT(obj, 0));
char *cstr = %const_cast(CHAR(STRING_ELT(obj, 0)), char *);
int len = strlen(cstr);
if (alloc) {
@ -130,9 +130,7 @@ SWIG_AsCharPtrAndSize(SEXP obj, char** cptr, size_t* psize, int *alloc)
*cptr = %new_copy_array(cstr, len + 1, char);
*alloc = SWIG_NEWOBJ;
} else {
*cptr = %reinterpret_cast(malloc(len + 1), char *);
*cptr = strcpy(*cptr, cstr);
*alloc = SWIG_OLDOBJ;
*cptr = cstr;
}
} else {
*cptr = %reinterpret_cast(malloc(len + 1), char *);