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

Suppress warning 325 "Nested class not currently supported (Foo

Browse source 
ignored)" when Foo has already been explicitly ignored with
"%ignore".
This commit is contained in:
Olly Betts 2015-05-05 18:06:04 +12:00
commit b19d506db7
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.6 (in progress) Version 3.0.6 (in progress)
=========================== ===========================
2015-05-05: olly
Suppress warning 325 "Nested class not currently supported (Foo
ignored)" when Foo has already been explicitly ignored with "%ignore".
2015-05-04: wsfulton 2015-05-04: wsfulton
Add support for friend templates, including operator overloading - fixes #196. Considering Add support for friend templates, including operator overloading - fixes #196. Considering
the example below, previously the operator gave a syntax error and friendfunc incorrectly the example below, previously the operator gave a syntax error and friendfunc incorrectly

7
Examples/test-suite/errors/cpp_macro_locator.i
View file

@ -100,4 +100,9 @@ void overloadinline2(const int *) {}
void overload5(int *) {} void overload5(int *) {}
void overload5(const int *) {} void overload5(const int *) {}
%ignore Outer2::QuietInner;
struct Outer2 {
struct QuietInner {
VARIABLEMACRO(MyInnerVar)
};
};

6
Source/CParse/parser.y
View file

@ -977,7 +977,6 @@ static void update_nested_classes(Node *n)
static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) { static Node *nested_forward_declaration(const char *storage, const char *kind, String *sname, String *name, Node *cpp_opt_declarators) {
Node *nn = 0; Node *nn = 0;
int warned = 0;
if (sname) { if (sname) {
/* Add forward declaration of the nested type */ /* Add forward declaration of the nested type */
@ -1021,13 +1020,12 @@ static Node *nested_forward_declaration(const char *storage, const char *kind, S
if (!currentOuterClass || !GetFlag(currentOuterClass, "nested")) { if (!currentOuterClass || !GetFlag(currentOuterClass, "nested")) {
if (nn && Equal(nodeType(nn), "classforward")) { if (nn && Equal(nodeType(nn), "classforward")) {
Node *n = nn; Node *n = nn;
if (!GetFlag(n, "feature:ignore")) {
SWIG_WARN_NODE_BEGIN(n); SWIG_WARN_NODE_BEGIN(n);
Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name); Swig_warning(WARN_PARSE_NAMED_NESTED_CLASS, cparse_file, cparse_line,"Nested %s not currently supported (%s ignored)\n", kind, sname ? sname : name);
SWIG_WARN_NODE_END(n); SWIG_WARN_NODE_END(n);
warned = 1;
} }
} else {
if (!warned) {
Swig_warning(WARN_PARSE_UNNAMED_NESTED_CLASS, cparse_file, cparse_line, "Nested %s not currently supported (ignored).\n", kind); Swig_warning(WARN_PARSE_UNNAMED_NESTED_CLASS, cparse_file, cparse_line, "Nested %s not currently supported (ignored).\n", kind);
} }
} }