← Back to branch summary

~ubuntu-branches/ubuntu/edgy/swig1.3/edgy

« back to all changes in this revision

Viewing changes to Source/Modules/utils.cxx

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-12-05 01:16:04 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051205011604-ygx904it6413k3go
Tags: 1.3.27-1ubuntu1
Resynchronise with Debian again, for the new subversion packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Source/Modules/utils.cxx
25
25
 
26
26
  if (checkAttribute(member,"director","1")) return 1;
27
27
  if (parentnode && checkAttribute(member, "storage", "virtual")) {
28
 
    int parent_nodirector = checkAttribute(parentnode,"feature:nodirector","1");
 
28
    int parent_nodirector = GetFlag(parentnode,"feature:nodirector");
29
29
    if (parent_nodirector) return 0;
30
 
    int parent_director = director_mode|| checkAttribute(parentnode,"feature:director","1");
31
 
    int cdecl_director = parent_director || checkAttribute(member,"feature:director","1");
32
 
    int cdecl_nodirector = checkAttribute(member,"feature:nodirector","1");
 
30
    int parent_director = director_mode || GetFlag(parentnode,"feature:director");
 
31
    int cdecl_director = parent_director || GetFlag(member,"feature:director");
 
32
    int cdecl_nodirector = GetFlag(member,"feature:nodirector");
33
33
    return cdecl_director && !cdecl_nodirector;
34
34
  } else {
35
35
    return 0;
50
50
  int   cnt = 0;
51
51
  while (nn) {
52
52
    if ((Strcmp(nodeType(nn),"template") == 0) ||
53
 
        (Getattr(nn,"feature:ignore")) ||
 
53
        (GetFlag(nn,"feature:ignore")) ||
54
54
        (Getattr(nn,"error")) ||
55
55
        // (checkAttribute(nn,"storage","friend")) ||
56
56
        ((Strcmp(nodeType(nn),"using") == 0) && !firstChild(nn))) {