67 lines
4.4 KiB
Diff
67 lines
4.4 KiB
Diff
Index: Source/Modules/lang.cxx
|
|
===================================================================
|
|
--- Source/Modules/lang.cxx (revision 13127)
|
|
+++ Source/Modules/lang.cxx (revision 13128)
|
|
@@ -2623,7 +2623,7 @@
|
|
Delete(expected_name_resolved);
|
|
}
|
|
if (illegal_name) {
|
|
- Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(name));
|
|
+ Swig_warning(WARN_LANG_RETURN_TYPE, input_file, line_number, "Function %s must have a return type. Ignored.\n", Swig_name_decl(n));
|
|
Swig_restore(n);
|
|
return SWIG_NOWRAP;
|
|
}
|
|
@@ -2760,7 +2760,7 @@
|
|
}
|
|
|
|
if (illegal_name) {
|
|
- Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(name));
|
|
+ Swig_warning(WARN_LANG_ILLEGAL_DESTRUCTOR, input_file, line_number, "Illegal destructor name %s. Ignored.\n", Swig_name_decl(n));
|
|
Swig_restore(n);
|
|
Delete(expected_name);
|
|
return SWIG_NOWRAP;
|
|
Index: Examples/test-suite/errors/expected.log
|
|
===================================================================
|
|
--- Examples/test-suite/errors/expected.log (revision 13127)
|
|
+++ Examples/test-suite/errors/expected.log (revision 13128)
|
|
@@ -227,17 +227,17 @@
|
|
cpp_extend_destructors.i:85: Warning 302: previous definition of '~JStruct'.
|
|
cpp_extend_destructors.i:100: Warning 302: Identifier '~LStruct' redefined (ignored),
|
|
cpp_extend_destructors.i:98: Warning 302: previous definition of '~LStruct'.
|
|
-cpp_extend_destructors.i:24: Warning 521: Illegal destructor name ~NOT_CStruct. Ignored.
|
|
-cpp_extend_destructors.i:30: Warning 521: Illegal destructor name ~NOT_DStruct. Ignored.
|
|
-cpp_extend_destructors.i:44: Warning 521: Illegal destructor name ~NOT_EStruct. Ignored.
|
|
-cpp_extend_destructors.i:50: Warning 521: Illegal destructor name ~NOT_FStruct. Ignored.
|
|
-cpp_extend_destructors.i:65: Warning 521: Illegal destructor name ~NOT_GStruct. Ignored.
|
|
-cpp_extend_destructors.i:72: Warning 521: Illegal destructor name ~NOT_HStruct. Ignored.
|
|
-cpp_extend_destructors.i:81: Warning 521: Illegal destructor name ~NOT_IStruct. Ignored.
|
|
-cpp_extend_destructors.i:86: Warning 521: Illegal destructor name ~NOT_JStruct. Ignored.
|
|
-cpp_extend_destructors.i:92: Warning 521: Illegal destructor name ~NOT_KStruct. Ignored.
|
|
-cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< int >. Ignored.
|
|
-cpp_extend_destructors.i:99: Warning 521: Illegal destructor name ~NOT_LStruct< short >. Ignored.
|
|
+cpp_extend_destructors.i:24: Warning 521: Illegal destructor name CStruct::~NOT_CStruct(). Ignored.
|
|
+cpp_extend_destructors.i:30: Warning 521: Illegal destructor name DStruct::~NOT_DStruct(). Ignored.
|
|
+cpp_extend_destructors.i:44: Warning 521: Illegal destructor name EStruct::~NOT_EStruct(). Ignored.
|
|
+cpp_extend_destructors.i:50: Warning 521: Illegal destructor name FStruct::~NOT_FStruct(). Ignored.
|
|
+cpp_extend_destructors.i:65: Warning 521: Illegal destructor name GStruct::~NOT_GStruct(). Ignored.
|
|
+cpp_extend_destructors.i:72: Warning 521: Illegal destructor name HStruct::~NOT_HStruct(). Ignored.
|
|
+cpp_extend_destructors.i:81: Warning 521: Illegal destructor name IStruct::~NOT_IStruct(). Ignored.
|
|
+cpp_extend_destructors.i:86: Warning 521: Illegal destructor name JStruct::~NOT_JStruct(). Ignored.
|
|
+cpp_extend_destructors.i:92: Warning 521: Illegal destructor name KStruct::~NOT_KStruct(). Ignored.
|
|
+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< int >::~NOT_LStruct(). Ignored.
|
|
+cpp_extend_destructors.i:99: Warning 521: Illegal destructor name LStruct< short >::~NOT_LStruct(). Ignored.
|
|
|
|
:::::::::::::::::::::::::::::::: cpp_extend_redefine.i :::::::::::::::::::::::::::::::::::
|
|
cpp_extend_redefine.i:9: Warning 302: Identifier 'bar' redefined by %extend (ignored),
|
|
@@ -312,8 +312,8 @@
|
|
cpp_no_access.i:3: Warning 319: No access specifier given for base class 'foo' (ignored).
|
|
|
|
:::::::::::::::::::::::::::::::: cpp_no_return_type.i :::::::::::::::::::::::::::::::::::
|
|
-cpp_no_return_type.i:6: Warning 504: Function R must have a return type. Ignored.
|
|
-cpp_no_return_type.i:10: Warning 504: Function UU must have a return type. Ignored.
|
|
+cpp_no_return_type.i:6: Warning 504: Function S::R() must have a return type. Ignored.
|
|
+cpp_no_return_type.i:10: Warning 504: Function U::UU() must have a return type. Ignored.
|
|
|
|
:::::::::::::::::::::::::::::::: cpp_nobase.i :::::::::::::::::::::::::::::::::::
|
|
cpp_nobase.i:3: Warning 401: Nothing known about base class 'Bar'. Ignored.
|