Minor code improvements

This commit is contained in:
William S Fulton 2013-11-29 07:33:55 +00:00
commit b65ba2a8db
5 changed files with 13 additions and 18 deletions

View file

@ -2391,7 +2391,7 @@ int Language::classDeclaration(Node *n) {
}
AccessMode oldAccessMode = cplus_mode;
Node *outerClass = Getattr(n, "nested:outer");
if (outerClass && oldAccessMode != Dispatcher::PUBLIC)
if (outerClass && oldAccessMode != PUBLIC)
return SWIG_NOWRAP;
ClassName = Copy(name);
ClassPrefix = Copy(symname);

View file

@ -862,13 +862,9 @@ void SWIG_getoptions(int argc, char *argv[]) {
}
}
void Swig_flatten_nested() {
String* name = NewString("");
String* fname = NewString("feature:flatnested");
String* val = NewString("1");
Swig_feature_set(Swig_cparse_features(),name,0,fname, val, 0);
Delete(fname);
Delete(name);
static void flatten_nested() {
String *val = NewString("1");
Swig_feature_set(Swig_cparse_features(), "", 0, "feature:flatnested", val, 0);
Delete(val);
}
@ -1167,7 +1163,7 @@ int SWIG_main(int argc, char *argv[], Language *l) {
// add "ignore" directive if nested classes are not supported
if (!lang->nestedClassesSupported())
Swig_flatten_nested();
flatten_nested();
Node *top = Swig_cparse(cpps);