Various warning fixes for Visual Studio 2003 C++ compiler
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@6204 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
578829d48e
commit
531719cebd
18 changed files with 29 additions and 16 deletions
|
|
@ -372,6 +372,7 @@ JAVA_LIBPREFIX = @JAVALIBRARYPREFIX@
|
||||||
JAVASO =@JAVASO@
|
JAVASO =@JAVASO@
|
||||||
JAVALDSHARED = @JAVALDSHARED@
|
JAVALDSHARED = @JAVALDSHARED@
|
||||||
JAVACXXSHARED = @JAVACXXSHARED@
|
JAVACXXSHARED = @JAVACXXSHARED@
|
||||||
|
JAVACFLAGS = @JAVACFLAGS@
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
# ----------------------------------------------------------------
|
||||||
# Build a java dynamically loadable module (C)
|
# Build a java dynamically loadable module (C)
|
||||||
|
|
@ -379,7 +380,7 @@ JAVACXXSHARED = @JAVACXXSHARED@
|
||||||
|
|
||||||
java: $(SRCS)
|
java: $(SRCS)
|
||||||
$(SWIG) -java $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -java $(SWIGOPT) $(INTERFACE)
|
||||||
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE)
|
$(CC) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(JAVA_INCLUDE)
|
||||||
$(JAVALDSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
|
$(JAVALDSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
# ----------------------------------------------------------------
|
||||||
|
|
@ -388,7 +389,7 @@ java: $(SRCS)
|
||||||
|
|
||||||
java_cpp: $(SRCS)
|
java_cpp: $(SRCS)
|
||||||
$(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -java -c++ $(SWIGOPT) $(INTERFACE)
|
||||||
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE)
|
$(CXX) -c $(CCSHARED) $(CFLAGS) $(JAVACFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(JAVA_INCLUDE)
|
||||||
$(JAVACXXSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
|
$(JAVACXXSHARED) $(OBJS) $(IOBJS) $(JAVA_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(JAVA_LIBPREFIX)$(TARGET)$(JAVASO)
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
|
|
@ -831,6 +832,7 @@ CSHARP_DLNK = @CSHARPDYNAMICLINKING@
|
||||||
CSHARP_LIBPREFIX = @CSHARPLIBRARYPREFIX@
|
CSHARP_LIBPREFIX = @CSHARPLIBRARYPREFIX@
|
||||||
CSHARPCOMPILER = @CSHARPCOMPILER@
|
CSHARPCOMPILER = @CSHARPCOMPILER@
|
||||||
CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
|
CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
|
||||||
|
CSHARPCFLAGS = @CSHARPCFLAGS@
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
# ----------------------------------------------------------------
|
||||||
# Build a CSharp dynamically loadable module (C)
|
# Build a CSharp dynamically loadable module (C)
|
||||||
|
|
@ -838,7 +840,7 @@ CSHARPCILINTERPRETER = @CSHARPCILINTERPRETER@
|
||||||
|
|
||||||
csharp: $(SRCS)
|
csharp: $(SRCS)
|
||||||
$(SWIG) -csharp $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -csharp $(SWIGOPT) $(INTERFACE)
|
||||||
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES)
|
$(CC) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(ISRCS) $(INCLUDES)
|
||||||
$(LDSHARED) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(SO)
|
$(LDSHARED) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(SO)
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
# ----------------------------------------------------------------
|
||||||
|
|
@ -847,7 +849,7 @@ csharp: $(SRCS)
|
||||||
|
|
||||||
csharp_cpp: $(SRCS)
|
csharp_cpp: $(SRCS)
|
||||||
$(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACE)
|
$(SWIG) -csharp -c++ $(SWIGOPT) $(INTERFACE)
|
||||||
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES)
|
$(CXX) -c $(CCSHARED) $(CFLAGS) $(CSHARPCFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES)
|
||||||
$(CXXSHARED) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(SO)
|
$(CXXSHARED) $(OBJS) $(IOBJS) $(CSHARP_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(CSHARP_LIBPREFIX)$(TARGET)$(SO)
|
||||||
|
|
||||||
# ----------------------------------------------------------------
|
# ----------------------------------------------------------------
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
template <FieldDim Dim>
|
template <FieldDim Dim>
|
||||||
class Facet;
|
struct Facet;
|
||||||
|
|
||||||
|
|
||||||
template <FieldDim Dim>
|
template <FieldDim Dim>
|
||||||
|
|
|
||||||
|
|
@ -17,9 +17,9 @@ class Test {
|
||||||
SomeClass o;
|
SomeClass o;
|
||||||
public:
|
public:
|
||||||
Test(int x) try : o(x) { }
|
Test(int x) try : o(x) { }
|
||||||
catch (Error &e) {
|
catch (Error &) {
|
||||||
}
|
}
|
||||||
catch (int y) {
|
catch (int) {
|
||||||
}
|
}
|
||||||
catch (...) {
|
catch (...) {
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
%{
|
%{
|
||||||
|
|
||||||
|
|
||||||
class A;
|
struct A;
|
||||||
struct B
|
struct B
|
||||||
{
|
{
|
||||||
B(int i) : v(i)
|
B(int i) : v(i)
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,11 @@ short full_of_exceptions(int num) {
|
||||||
|
|
||||||
|
|
||||||
%typemap(throws, throws="IllegalAccessException") int {
|
%typemap(throws, throws="IllegalAccessException") int {
|
||||||
|
(void)$1;
|
||||||
jclass excep = jenv->FindClass("java/lang/IllegalAccessException");
|
jclass excep = jenv->FindClass("java/lang/IllegalAccessException");
|
||||||
if (excep)
|
if (excep) {
|
||||||
jenv->ThrowNew(excep, "Test exception");
|
jenv->ThrowNew(excep, "Test exception");
|
||||||
|
}
|
||||||
return $null;
|
return $null;
|
||||||
}
|
}
|
||||||
%inline %{
|
%inline %{
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
int hello(int);
|
int hello(int);
|
||||||
inline int hello(int) { return 0; }
|
inline int hello(int) { return 0; }
|
||||||
|
|
||||||
class B;
|
struct B;
|
||||||
|
|
||||||
struct A
|
struct A
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -30,10 +30,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
class UnaryFunction;
|
struct UnaryFunction;
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
class ArithUnaryFunction;
|
struct ArithUnaryFunction;
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
struct UnaryFunction : UnaryFunctionBase
|
struct UnaryFunction : UnaryFunctionBase
|
||||||
|
|
|
||||||
|
|
@ -33,10 +33,10 @@ typedef std::complex<double> cmplx;
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
class UnaryFunction;
|
struct UnaryFunction;
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
class ArithUnaryFunction;
|
struct ArithUnaryFunction;
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
struct UnaryFunction : UnaryFunctionBase
|
struct UnaryFunction : UnaryFunctionBase
|
||||||
|
|
|
||||||
|
|
@ -19,10 +19,10 @@ namespace vfncs {
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
class UnaryFunction;
|
struct UnaryFunction;
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
class ArithUnaryFunction;
|
struct ArithUnaryFunction;
|
||||||
|
|
||||||
template <class ArgType, class ResType>
|
template <class ArgType, class ResType>
|
||||||
struct UnaryFunction : UnaryFunctionBase
|
struct UnaryFunction : UnaryFunctionBase
|
||||||
|
|
|
||||||
|
|
@ -297,6 +297,7 @@ $1 = &temp; %}
|
||||||
}
|
}
|
||||||
|
|
||||||
%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY] %{
|
%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY] %{
|
||||||
|
(void)$1;
|
||||||
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,6 +15,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
SWIG_CSharpThrowException(SWIG_CSharpException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@
|
||||||
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
%typecheck(SWIG_TYPECHECK_INT32) enum SWIGTYPE ""
|
||||||
|
|
||||||
%typemap(throws) enum SWIGTYPE %{
|
%typemap(throws) enum SWIGTYPE %{
|
||||||
|
(void)$1;
|
||||||
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -773,6 +773,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY] %{
|
%typemap(throws) SWIGTYPE, SWIGTYPE &, SWIGTYPE *, SWIGTYPE [ANY] %{
|
||||||
|
(void)$1;
|
||||||
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
SWIG_JavaThrowException(jenv, SWIG_JavaRuntimeException, "C++ $1_type exception thrown");
|
||||||
return $null;
|
return $null;
|
||||||
%}
|
%}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue