summaryrefslogtreecommitdiffstats
path: root/src/xmlgen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2018-12-26 11:53:15 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2018-12-26 11:53:15 (GMT)
commitd03868616adf46369b0e208a093493f71b3f98b0 (patch)
treee471db0d12a248534a84609b96971cf23b71a806 /src/xmlgen.cpp
parent1f4a3ab39a467b2e5e0159f95ed10cb9830d5011 (diff)
parentf5ed5051c0754f9c7e0e5556114e173016d7f984 (diff)
downloadDoxygen-d03868616adf46369b0e208a093493f71b3f98b0.zip
Doxygen-d03868616adf46369b0e208a093493f71b3f98b0.tar.gz
Doxygen-d03868616adf46369b0e208a093493f71b3f98b0.tar.bz2
Merge branch 'xml-namespace-members-in-file-scope' of https://github.com/mosra/doxygen into mosra-xml-namespace-members-in-file-scope
Diffstat (limited to 'src/xmlgen.cpp')
-rw-r--r--src/xmlgen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 4b12757..985a3e7 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -1027,7 +1027,7 @@ static void generateXMLSection(Definition *d,FTextStream &ti,FTextStream &t,
{
// namespace members are also inserted in the file scope, but
// to prevent this duplication in the XML output, we filter those here.
- if (d->definitionType()!=Definition::TypeFile || md->getNamespaceDef()==0)
+ if ((Config_getBool(XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE) || d->definitionType()!=Definition::TypeFile) || md->getNamespaceDef()==0)
{
count++;
}
@@ -1049,7 +1049,7 @@ static void generateXMLSection(Definition *d,FTextStream &ti,FTextStream &t,
{
// namespace members are also inserted in the file scope, but
// to prevent this duplication in the XML output, we filter those here.
- if (d->definitionType()!=Definition::TypeFile || md->getNamespaceDef()==0)
+ if ((Config_getBool(XML_NAMESPACE_MEMBERS_IN_FILE_SCOPE) || d->definitionType()!=Definition::TypeFile) || md->getNamespaceDef()==0)
{
generateXMLForMember(md,ti,t,d);
}