summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-02-20 20:23:07 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-02-20 20:23:07 (GMT)
commitef6c0b40647c5c56f7e6f8289a4c2d61982763d1 (patch)
tree82071291d54bcb333c8bd1be6d6242925016c74a
parent9b76c1a9bb7039962933aeef398bb7aa2f59c3a5 (diff)
parentb0456fbefa864b33611f289818deeaaf791c17c9 (diff)
downloadDoxygen-ef6c0b40647c5c56f7e6f8289a4c2d61982763d1.zip
Doxygen-ef6c0b40647c5c56f7e6f8289a4c2d61982763d1.tar.gz
Doxygen-ef6c0b40647c5c56f7e6f8289a4c2d61982763d1.tar.bz2
Merge pull request #122 from albert-github/feature/bug_724241
Bug 724241 - Internal inconsistency: namespace in IDL
-rw-r--r--src/namespacedef.cpp10
-rw-r--r--src/namespacedef.h3
2 files changed, 11 insertions, 2 deletions
diff --git a/src/namespacedef.cpp b/src/namespacedef.cpp
index 253b712..b43173d 100644
--- a/src/namespacedef.cpp
+++ b/src/namespacedef.cpp
@@ -68,6 +68,10 @@ NamespaceDef::NamespaceDef(const char *df,int dl,int dc,
{
m_type = CONSTANT_GROUP;
}
+ else if (type && !strcmp("library", type))
+ {
+ m_type = LIBRARY;
+ }
else
{
m_type = NAMESPACE;
@@ -1109,9 +1113,13 @@ QCString NamespaceDef::compoundTypeString() const
{
return "constants";
}
+ else if (isLibrary())
+ {
+ return "library";
+ }
else
{
- err("Internal inconsistency: namespace in IDL not module or constant group\n");
+ err("Internal inconsistency: namespace in IDL not module, library or constant group\n");
}
}
return "";
diff --git a/src/namespacedef.h b/src/namespacedef.h
index fedd410..4613480 100644
--- a/src/namespacedef.h
+++ b/src/namespacedef.h
@@ -68,6 +68,7 @@ class NamespaceDef : public Definition
bool isConstantGroup() const { return CONSTANT_GROUP == m_type; }
bool isModule() const { return MODULE == m_type; }
+ bool isLibrary() const { return LIBRARY == m_type; }
bool isLinkableInProject() const;
bool isLinkable() const;
@@ -132,7 +133,7 @@ class NamespaceDef : public Definition
ClassSDict *classSDict;
NamespaceSDict *namespaceSDict;
bool m_subGrouping;
- enum { NAMESPACE, MODULE, CONSTANT_GROUP } m_type;
+ enum { NAMESPACE, MODULE, CONSTANT_GROUP, LIBRARY } m_type;
bool m_isPublished;
};