diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2007-11-11 20:26:58 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2007-11-11 20:26:58 +0000 |
| commit | a80c41bef53f3e69d6955b6774e0c5b0fbbf94e6 (patch) | |
| tree | b6b5f0ca27d822fdd5e00fc1bc9cb1289daac038 /Lib/r/rfragments.swg | |
| parent | 7bbf5d66d1ce54a6ef658d592ee9c4f7af51ab42 (diff) | |
| download | swig-a80c41bef53f3e69d6955b6774e0c5b0fbbf94e6.tar.gz | |
Dont use the global namespace polluting methods in the R headers - provides Visual C++ support
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10109 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Lib/r/rfragments.swg')
| -rw-r--r-- | Lib/r/rfragments.swg | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Lib/r/rfragments.swg b/Lib/r/rfragments.swg index f6a78bf75..5d8455cf3 100644 --- a/Lib/r/rfragments.swg +++ b/Lib/r/rfragments.swg @@ -1,24 +1,24 @@ -#define SWIG_Error(code, msg) warning(msg); return Rf_ScalarLogical(NA_LOGICAL) +#define SWIG_Error(code, msg) Rf_warning(msg); return Rf_ScalarLogical(NA_LOGICAL) #define SWIG_fail return Rf_ScalarLogical(NA_LOGICAL) /* for raw pointers */ -#define SWIG_ConvertPtr(oc, ptr, ty, flags) SWIG_R_ConvertPtr(oc, ptr, ty, flags) -#define SWIG_ConvertFunctionPtr(oc, ptr, ty) SWIG_R_ConvertPtr(oc, ptr, ty, 0) -#define SWIG_NewPointerObj(ptr, ty, flags) SWIG_R_NewPointerObj(ptr, ty, flags) -#define SWIG_NewFunctionPtrObj(ptr, ty) SWIG_R_NewPointerObj(ptr, ty, 0) +#define SWIG_ConvertPtr(oc, ptr, ty, flags) SWIG_R_ConvertPtr(oc, ptr, ty, flags) +#define SWIG_ConvertFunctionPtr(oc, ptr, ty) SWIG_R_ConvertPtr(oc, ptr, ty, 0) +#define SWIG_NewPointerObj(ptr, ty, flags) SWIG_R_NewPointerObj(ptr, ty, flags) +#define SWIG_NewFunctionPtrObj(ptr, ty) SWIG_R_NewPointerObj(ptr, ty, 0) /* for raw packed data */ #define SWIG_ConvertPacked(obj, ptr, sz, ty) SWIG_R_ConvertPacked(obj, ptr, sz, ty) -#define SWIG_NewPackedObj(ptr, sz, ty) SWIG_R_NewPackedObj(ptr, sz, ty) +#define SWIG_NewPackedObj(ptr, sz, ty) SWIG_R_NewPackedObj(ptr, sz, ty) /* for class or struct pointers */ -#define SWIG_ConvertInstance(obj, pptr, ty, flags) SWIG_ConvertPtr(obj, pptr, ty, flags) -#define SWIG_NewInstanceObj(ptr, ty, flags) SWIG_NewPointerObj(ptr, ty, flags) +#define SWIG_ConvertInstance(obj, pptr, ty, flags) SWIG_ConvertPtr(obj, pptr, ty, flags) +#define SWIG_NewInstanceObj(ptr, ty, flags) SWIG_NewPointerObj(ptr, ty, flags) /* for C++ member pointers, ie, member methods */ #define SWIG_ConvertMember(obj, ptr, sz, ty) SWIG_R_ConvertPacked(obj, ptr, sz, ty) -#define SWIG_NewMemberObj(ptr, sz, ty) SWIG_R_NewPackedObj(ptr, sz, ty) +#define SWIG_NewMemberObj(ptr, sz, ty) SWIG_R_NewPackedObj(ptr, sz, ty) /* Runtime API */ @@ -158,11 +158,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size) if (!carray) return R_NilValue; RVERSION26(return Rf_mkCharEnc(carray, size)); RVERSIONPRE26( - PROTECT(t = allocVector(STRSXP, 1)); + Rf_protect(t = Rf_allocVector(STRSXP, 1)); c = allocString(size); strncpy(CHAR(c), carray, size); SET_STRING_ELT(t, 0, c); - UNPROTECT(1);) + Rf_unprotect(1);) return t; } } |