From 0aeec2da5d6b32817d196cb34fbde4632f4375ef Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Nov 25 2016 12:29:31 +0000 Subject: Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work --- diff --git a/doxygen-774273.patch b/doxygen-774273.patch new file mode 100644 index 0000000..d64cc51 --- /dev/null +++ b/doxygen-774273.patch @@ -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); diff --git a/doxygen.spec b/doxygen.spec index 0d31f91..14df27c 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -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 - - 1:1.8.12-4 +- Bug 774273 - INLINE_SIMPLE_STRUCTS with enums in classes does not work + * Tue Nov 15 2016 Than Ngo - 1:1.8.12-3 - bz#1394456, add missing docs - fix build issue when build_doc=ON