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

Merge branch 'vadz-java-vector'

Browse source 
* vadz-java-vector:
  Fix potential STL std::vector wrappers <: digraphs problems.
  Add runtime checks for vector size in Java
  Make std::vector<> wrappers conform to List interface in Java
  Add helper macro to avoid duplication in Java vector typemaps

Conflicts:
	CHANGES.current
This commit is contained in:
William S Fulton 2017-05-26 19:15:12 +01:00
commit 338acfabeb
4 changed files with 181 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/java/java.swg
View file

@ -103,9 +103,25 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
%typemap(jstype) double, const double & "double"
%typemap(jstype) void "void"
%typemap(jboxtype) bool "Boolean"
%typemap(jboxtype) char "Character"
%typemap(jboxtype) signed char "Byte"
%typemap(jboxtype) unsigned char "Short"
%typemap(jboxtype) short "Short"
%typemap(jboxtype) unsigned short "Integer"
%typemap(jboxtype) int "Integer"
%typemap(jboxtype) unsigned int "Long"
%typemap(jboxtype) long "Integer"
%typemap(jboxtype) unsigned long "Long"
%typemap(jboxtype) long long "Long"
%typemap(jboxtype) unsigned long long "java.math.BigInteger"
%typemap(jboxtype) float "Float"
%typemap(jboxtype) double "Double"
%typemap(jni) char *, char *&, char[ANY], char[] "jstring"
%typemap(jtype) char *, char *&, char[ANY], char[] "String"
%typemap(jstype) char *, char *&, char[ANY], char[] "String"
%typemap(jboxtype) char *, char *&, char[ANY], char[] "String"
/* JNI types */
%typemap(jni) jboolean "jboolean"
@ -172,6 +188,7 @@ SWIGINTERN const char * SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
%typemap(jni) SWIGTYPE "jlong"
%typemap(jtype) SWIGTYPE "long"
%typemap(jstype) SWIGTYPE "$&javaclassname"
%typemap(jboxtype) SWIGTYPE "$typemap(jstype, $1_type)"
%typemap(jni) SWIGTYPE [] "jlong"
%typemap(jtype) SWIGTYPE [] "long"