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

Fix problem that was causing breakage in pre-2.7 R

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10471 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Joseph Wang 2008-05-20 02:26:01 +00:00
commit 43a6695de0
2 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/r/rfragments.swg
View file

@ -164,14 +164,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
{ {
SEXP t, c; SEXP t, c;
if (!carray) return R_NilValue; if (!carray) return R_NilValue;
RVERSION27(return Rf_mkCharLen(carray, size));
RVERSIONPRE27(
Rf_protect(t = Rf_allocVector(STRSXP, 1)); Rf_protect(t = Rf_allocVector(STRSXP, 1));
c = allocString(size); c = Rf_allocVector(CHARSXP, size);
strncpy((char *)CHAR(c), carray, size); strncpy((char *)CHAR(c), carray, size);
SET_STRING_ELT(t, 0, c); SET_STRING_ELT(t, 0, c);
Rf_unprotect(1); Rf_unprotect(1);
return t;) return t;
} }
} }

10
Lib/r/rrun.swg
View file

@ -18,18 +18,10 @@ extern "C" {
#define SWIGR 1 #define SWIGR 1
#if R_VERSION >= R_Version(2,7,0) #if R_VERSION >= R_Version(2,6,0)
#define VMAXTYPE void * #define VMAXTYPE void *
#define RVERSION27(x) x
#define RVERSIONPRE27(x)
#elif R_VERSION >= R_Version(2,6,0)
#define VMAXTYPE void *
#define RVERSION26(x) x
#define RVERSIONPRE26(x)
#else #else
#define VMAXTYPE char * #define VMAXTYPE char *
#define RVERSION26(x)
#define RVERSIONPRE26(x) x
#endif #endif
/* /*