Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work

This commit is contained in:
Than Ngo 2016-11-25 13:29:31 +01:00
parent 810d0d616b
commit 0aeec2da5d
2 changed files with 20 additions and 1 deletions

15
doxygen-774273.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 51fb8c6..111d59b 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -573,7 +573,9 @@ void ClassDef::internalInsertMember(MemberDef *md,
break;
case Public:
addMemberToList(MemberListType_pubTypes,md,TRUE);
- isSimple=QCString(md->typeString()).find(")(")==-1;
+ isSimple=!md->isEnumerate() &&
+ !md->isEnumValue() &&
+ QCString(md->typeString()).find(")(")==-1; // func ptr typedef
break;
case Private:
addMemberToList(MemberListType_priTypes,md,TRUE);

View File

@ -2,7 +2,7 @@ Summary: A documentation system for C/C++
Name: doxygen
Epoch: 1
Version: 1.8.12
Release: 3%{?dist}
Release: 4%{?dist}
# No version is specified.
License: GPL+
@ -15,6 +15,7 @@ Source2: doxywizard.desktop
# upstream fixes
Patch1: doxygen-771310.patch
Patch2: doxygen-771344.patch
Patch3: doxygen-774273.patch
BuildRequires: perl
BuildRequires: tex(dvips)
@ -132,6 +133,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
# intentionally left blank
%changelog
* Fri Nov 25 2016 Than Ngo <than@redhat.com> - - 1:1.8.12-4
- Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work
* Tue Nov 15 2016 Than Ngo <than@redhat.com> - 1:1.8.12-3
- bz#1394456, add missing docs
- fix build issue when build_doc=ON