Release-1.6.1-20091027

1 files changed, 11 insertions, 6 deletions

diff --git a/src/definition.cpp b/src/definition.cpp
index 32e7d64..fb20434 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -198,7 +198,7 @@ static bool matchExcludedSymbols(const char *name)
 
 void Definition::addToMap(const char *name,Definition *d)
 {
-  static bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
+  bool vhdlOpt = Config_getBool("OPTIMIZE_OUTPUT_VHDL");
   QCString symbolName = name;
   int index=computeQualifiedIndex(symbolName);
   if (!vhdlOpt && index!=-1) symbolName=symbolName.mid(index+2);
@@ -383,8 +383,8 @@ bool Definition::_docsAlreadyAdded(const QCString &doc)
 }
 
 void Definition::_setDocumentation(const char *d,const char *docFile,int docLine,
-                                   bool stripWhiteSpace,bool atTop) 
-{ 
+                                   bool stripWhiteSpace,bool atTop)
+{
   if (d==0) return;
   //printf("Definition::setDocumentation(%s,%s,%d,%d)\n",d,docFile,docLine,stripWhiteSpace);
   QCString doc = d;
@@ -405,21 +405,26 @@ void Definition::_setDocumentation(const char *d,const char *docFile,int docLine
     }
     if (m_impl->details->doc.isEmpty()) // fresh detailed description
     {
-      m_impl->details->doc  = doc;
+      m_impl->details->doc = doc;
     }
     else if (atTop) // another detailed description, append it to the start
     {
-      m_impl->details->doc  = doc+"\n\n"+m_impl->details->doc;
+      m_impl->details->doc = doc+"\n\n"+m_impl->details->doc;
     }
     else // another detailed description, append it to the end
     {
-      m_impl->details->doc  += "\n\n"+doc;
+      m_impl->details->doc += "\n\n"+doc;
     }
     if (docLine!=-1) // store location if valid
     {
       m_impl->details->file = docFile;
       m_impl->details->line = docLine;
     }
+    else
+    {
+      m_impl->details->file = docFile;
+      m_impl->details->line = 1;
+    }
   }
 }