diff options
| author | Joseph Wang <joequant@gmail.com> | 2008-04-26 05:50:13 +0000 |
|---|---|---|
| committer | Joseph Wang <joequant@gmail.com> | 2008-04-26 05:50:13 +0000 |
| commit | 7b37f04c7ad23e92b9d3de6b5055bc2425d26817 (patch) | |
| tree | 892fa4c01ca5948577dce8533f4438adeab02295 /Lib/r/rfragments.swg | |
| parent | bc5bd7a0abd40998b42a28b27a3838283be4c69e (diff) | |
| download | swig-7b37f04c7ad23e92b9d3de6b5055bc2425d26817.tar.gz | |
change CHAR method since mkCharEnc doesn't do what I thought it did in 2.6
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10389 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Lib/r/rfragments.swg')
| -rw-r--r-- | Lib/r/rfragments.swg | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/r/rfragments.swg b/Lib/r/rfragments.swg index 67944b2fe..cc75339e2 100644 --- a/Lib/r/rfragments.swg +++ b/Lib/r/rfragments.swg @@ -164,13 +164,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size) { SEXP t, c; if (!carray) return R_NilValue; - RVERSION26(return Rf_mkCharEnc(carray, size)); - RVERSIONPRE26( Rf_protect(t = Rf_allocVector(STRSXP, 1)); c = allocString(size); - strncpy(CHAR(c), carray, size); + strncpy((char *)CHAR(c), carray, size); SET_STRING_ELT(t, 0, c); - Rf_unprotect(1);) + Rf_unprotect(1); return t; } } |