diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2002-02-18 21:34:02 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2002-02-18 21:34:02 (GMT) |
commit | fa7e820834f7e7648a24accbbaa998092034c80f (patch) | |
tree | 714079396631ac6488c45cce3d6acfb51e31f9a8 /src/doxygen.cpp | |
parent | 37dc8d4605e2fa9a924a08597580d471445acc08 (diff) | |
download | Doxygen-fa7e820834f7e7648a24accbbaa998092034c80f.zip Doxygen-fa7e820834f7e7648a24accbbaa998092034c80f.tar.gz Doxygen-fa7e820834f7e7648a24accbbaa998092034c80f.tar.bz2 |
Release-1.2.14
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r-- | src/doxygen.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index dd39762..1168e25 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * $Id$ + * * * * Copyright (C) 1997-2002 by Dimitri van Heesch. @@ -1294,9 +1294,14 @@ static MemberDef *addVariableToFile( MemberDef *md; for (mni.toFirst();(md=mni.current());++mni) { - if ((nd==0 && md->getFileDef() && - root->fileName==md->getFileDef()->absFilePath()) - || (nd!=0 && md->getNamespaceDef()==nd)) + if ( + ((nd==0 && md->getFileDef() && + root->fileName==md->getFileDef()->absFilePath() + ) + || (nd!=0 && md->getNamespaceDef()==nd) + ) + && !md->isDefine() // function style #define's can be "overloaded" by typedefs or variables + ) // variable already in the scope { addMemberDocs(root,md,def,0,FALSE); |