diff options
| -rw-r--r-- | src/groupdef.cpp | 4 | ||||
| -rw-r--r-- | src/scanner.l | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/groupdef.cpp b/src/groupdef.cpp index 4b2f623..7b2c71c 100644 --- a/src/groupdef.cpp +++ b/src/groupdef.cpp @@ -1373,8 +1373,8 @@ void addGroupToGroups(const Entry *root,GroupDef *subGroup) /*! Add a member to the group with the highest priority */ void addMemberToGroups(const Entry *root,MemberDef *md) { - //printf("addMemberToGroups: Root %p = %s, md %p=%s groups=%d\n", - // root, root->name.data(), md, md->name().data(), root->groups->count() ); + //printf("addMemberToGroups: Root %p = %s, md %p=%s groups=%zu\n", + // root, root->name.data(), md, md->name().data(), root->groups.size() ); // Search entry's group list for group with highest pri. Grouping::GroupPri_t pri = Grouping::GROUPING_LOWEST; diff --git a/src/scanner.l b/src/scanner.l index 19381dd..6970d3e 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -7197,7 +7197,7 @@ static void parseCompounds(yyscan_t yyscanner,const std::shared_ptr<Entry> &rt) // deep copy group list from parent (see bug 727732) bool autoGroupNested = Config_getBool(GROUP_NESTED_COMPOUNDS); - if (autoGroupNested && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum)) + if (autoGroupNested && !rt->groups.empty() && ce->section!=Entry::ENUM_SEC && !(ce->spec&Entry::Enum)) { ce->groups = rt->groups; } |