From 97d12d058a7831adcc8c6f2cfe8c20ddd2ae5bc2 Mon Sep 17 00:00:00 2001
From: Dimitri van Heesch <dimitri@stack.nl>
Date: Fri, 8 Aug 2014 14:32:33 +0200
Subject: [PATCH] Bug 733451 - volatile declaration on member functions is not
 handled as xml attribute

---
 src/compound.xsd | 12 ++++++------
 src/xmlgen.cpp   |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/compound.xsd b/src/compound.xsd
index 2521a2eaa21..dec596b2d3d 100644
--- a/src/compound.xsd
+++ b/src/compound.xsd
@@ -145,12 +145,12 @@
     <xsd:attribute name="id" type="xsd:string" />
     <xsd:attribute name="prot" type="DoxProtectionKind" />
     <xsd:attribute name="static" type="DoxBool" />
-    <xsd:attribute name="const" type="DoxBool" />
-    <xsd:attribute name="explicit" type="DoxBool" />
-    <xsd:attribute name="inline" type="DoxBool" />
-    <xsd:attribute name="virt" type="DoxVirtualKind" />
-    <xsd:attribute name="volatile" type="DoxBool" />
-    <xsd:attribute name="mutable" type="DoxBool" />
+    <xsd:attribute name="const" type="DoxBool" use="optional"/>
+    <xsd:attribute name="explicit" type="DoxBool" use="optional"/>
+    <xsd:attribute name="inline" type="DoxBool" use="optional"/>
+    <xsd:attribute name="virt" type="DoxVirtualKind" use="optional"/>
+    <xsd:attribute name="volatile" type="DoxBool" use="optional"/>
+    <xsd:attribute name="mutable" type="DoxBool" use="optional"/>
     <!-- Qt property -->
     <xsd:attribute name="readable" type="DoxBool" use="optional"/>
     <xsd:attribute name="writable" type="DoxBool" use="optional"/>
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 2bb57342b5f..c9fe950c931 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -646,6 +646,11 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
       t << " required=\"yes\"";
     }
 
+    if (al && al->volatileSpecifier)
+    {
+      t << " volatile=\"yes\"";
+    }
+
     t << " virt=\"";
     switch (md->virtualness())
     {
@@ -671,7 +676,6 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
     {
       t << " initonly=\"yes\"";
     }
-
     if (md->isAttribute())
     {
       t << " attribute=\"yes\"";