String x = "";, dumps core now in the destructor, changed to String x;
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@332 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
74c7af45f7
commit
f66c034759
3 changed files with 19 additions and 17 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
/* SWIG version information */
|
/* SWIG version information */
|
||||||
|
|
||||||
#define SWIG_VERSION "1.3u-20000229-1426"
|
#define SWIG_VERSION "1.3u-20000305-1721"
|
||||||
#define SWIG_SPIN "(Alpha 1)"
|
#define SWIG_SPIN "(Alpha 2)"
|
||||||
|
|
|
||||||
|
|
@ -1009,7 +1009,7 @@ void JAVA::cpp_close_class() {
|
||||||
|
|
||||||
void JAVA::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) {
|
void JAVA::cpp_member_func(char *name, char *iname, DataType *t, ParmList *l) {
|
||||||
String arg;
|
String arg;
|
||||||
String nativecall = "";
|
String nativecall;
|
||||||
|
|
||||||
this->Language::cpp_member_func(name,iname,t,l);
|
this->Language::cpp_member_func(name,iname,t,l);
|
||||||
|
|
||||||
|
|
@ -1154,7 +1154,7 @@ void JAVA::cpp_constructor(char *name, char *iname, ParmList *l) {
|
||||||
if(!shadow) return;
|
if(!shadow) return;
|
||||||
if(!shadow_classdef_emitted) emit_shadow_classdef();
|
if(!shadow_classdef_emitted) emit_shadow_classdef();
|
||||||
|
|
||||||
String nativecall = "";
|
String nativecall;
|
||||||
String arg;
|
String arg;
|
||||||
|
|
||||||
fprintf(f_shadow, " public %s(", shadow_classname);
|
fprintf(f_shadow, " public %s(", shadow_classname);
|
||||||
|
|
|
||||||
|
|
@ -471,8 +471,8 @@ AC_SUBST(PERL5EXT)
|
||||||
# Look for java
|
# Look for java
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
|
||||||
AC_ARG_WITH(java, [ --with-java=path Set location of java executable],[JAVABIN="$withval"], [JAVABIN=nope])
|
AC_ARG_WITH(java, [ --with-java=path Set location of Java],[JAVABIN="$withval"], [JAVABIN=nope])
|
||||||
AC_ARG_WITH(javac, [ --with-javac=path Set location of javac executable],[JAVACBIN="$withval"], [JAVACBIN=nope])
|
AC_ARG_WITH(javac, [ --with-javac=path Set location of Javac],[JAVACBIN="$withval"], [JAVACBIN=nope])
|
||||||
|
|
||||||
if test "$JAVABIN" = nope ; then
|
if test "$JAVABIN" = nope ; then
|
||||||
AC_CHECK_PROGS(JAVA, java kaffe guavac, nope)
|
AC_CHECK_PROGS(JAVA, java kaffe guavac, nope)
|
||||||
|
|
@ -487,21 +487,23 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_CHECKING(for java include file jni.h)
|
AC_MSG_CHECKING(for java include file jni.h)
|
||||||
AC_ARG_WITH(java, [ --with-java-include=path Set location of java include files], [JAVAINCDIR="$withval"], [JAVAINCDIR=nope])
|
AC_ARG_WITH(javaincl, [ --with-javaincl=path Set location of Java include directory], [JAVAINCDIR="$withval"], [JAVAINCDIR=nope])
|
||||||
|
|
||||||
if test "$JAVAINCDIR" = nope; then
|
if test "$JAVAINCDIR" = nope; then
|
||||||
dirs="/usr/java/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/include/kaffe /usr/local/include/kaffe"
|
JAVAINCDIR="/usr/java/include /usr/local/java/include /opt/java/include /usr/include/java /usr/local/include/java /usr/include/kaffe /usr/local/include/kaffe /usr/include /usr/local/include"
|
||||||
for d in $dirs ; do
|
|
||||||
if test -r $d/jni.h ; then
|
|
||||||
AC_MSG_RESULT($d)
|
|
||||||
JAVAINCDIR=$d
|
|
||||||
JAVAINC="-I$d"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$JAVAINCDIR" = nope ; then
|
JAVAINC=""
|
||||||
|
for d in $JAVAINCDIR ; do
|
||||||
|
if test -r $d/jni.h ; then
|
||||||
|
AC_MSG_RESULT($d)
|
||||||
|
JAVAINCDIR=$d
|
||||||
|
JAVAINC="-I$d"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if test "$JAVAINC" = "" ; then
|
||||||
AC_MSG_RESULT(not found)
|
AC_MSG_RESULT(not found)
|
||||||
else
|
else
|
||||||
# now look for <arch>/md.h
|
# now look for <arch>/md.h
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue