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

Fix R Lib files and testcase failing due to new preprocessor checks

Browse source 
Fixes unknown preprocessor directive error introduced in #217
commit 255c929c56
These were probably intended as script comments using # when C/C++
comments using // or /* */ should have been used.
This commit is contained in:
William S Fulton 2014-10-29 22:57:55 +00:00
commit ede1e9544c
3 changed files with 16 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Examples/test-suite/r_overload_array.i
View file

@ -1,7 +1,8 @@
%module r_overload_array %module r_overload_array
%include "stl.i"
# this tests the situation in which there is a scalar function %include <stl.i>
# corresponding with a vector one // this tests the situation in which there is a scalar function
// corresponding with a vector one
%inline %{ %inline %{
class Foo { class Foo {

2
Lib/r/rfragments.swg
View file

@ -153,7 +153,7 @@ SWIG_strdup(const char *str)
} }
} }
# This is modified from the R header files //# This is modified from the R header files
%fragment("SWIG_FromCharPtrAndSize","header") %fragment("SWIG_FromCharPtrAndSize","header")
{ {

34
Lib/r/rtype.swg
View file

@ -149,34 +149,22 @@ string &, std::string &
%typemap(scoerceout) enum SWIGTYPE *const %typemap(scoerceout) enum SWIGTYPE *const
%{ $result = enumToInteger($result, "$R_class"); %} %{ $result = enumToInteger($result, "$R_class"); %}
#%typemap(scoerceout) SWIGTYPE %typemap(scoerceout) SEXP %{ %}
# %{ class($result) <- "$&R_class"; %}
#%typemap(scoerceout) SWIGTYPE & %typemap(scoerceout) SWIGTYPE
# %{ class($result) <- "$R_class"; %} %{ $result <- new("$&R_class", ref=$result); %}
#%typemap(scoerceout) SWIGTYPE * %typemap(scoerceout) SWIGTYPE &
# %{ class($result) <- "$R_class"; %} %{ $result <- new("$R_class", ref=$result) ; %}
#%typemap(scoerceout) SWIGTYPE *const %typemap(scoerceout) SWIGTYPE &&
# %{ class($result) <- "$R_class"; %} %{ $result <- new("$R_class", ref=$result) ; %}
%typemap(scoerceout) SEXP %{ %} %typemap(scoerceout) SWIGTYPE *
%{ $result <- new("$R_class", ref=$result) ; %}
%typemap(scoerceout) SWIGTYPE %typemap(scoerceout) SWIGTYPE *const
%{ $result <- new("$&R_class", ref=$result); %} %{ $result <- new("$R_class", ref=$result) ; %}
%typemap(scoerceout) SWIGTYPE &
%{ $result <- new("$R_class", ref=$result) ; %}
%typemap(scoerceout) SWIGTYPE &&
%{ $result <- new("$R_class", ref=$result) ; %}
%typemap(scoerceout) SWIGTYPE *
%{ $result <- new("$R_class", ref=$result) ; %}
%typemap(scoerceout) SWIGTYPE *const
%{ $result <- new("$R_class", ref=$result) ; %}
/* Override the SWIGTYPE * above. */ /* Override the SWIGTYPE * above. */