summaryrefslogtreecommitdiffstats
path: root/src/pre.l
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2020-07-02 10:22:00 (GMT)
committeralbert-github <albert.tests@gmail.com>2020-07-02 10:22:00 (GMT)
commitc30fbe4eba7f27c6296dea587eefe3d8b489661a (patch)
tree4f4bee61aa53c4efaabd69392f15c147e713f909 /src/pre.l
parent3e9d9386950cc67d155a920cf8483c4d5bdcec3c (diff)
downloadDoxygen-c30fbe4eba7f27c6296dea587eefe3d8b489661a.zip
Doxygen-c30fbe4eba7f27c6296dea587eefe3d8b489661a.tar.gz
Doxygen-c30fbe4eba7f27c6296dea587eefe3d8b489661a.tar.bz2
issue #7890 Macro Expansion broken
The defines from the doxygen configuration file were not taken into account du a wrong primary key.
Diffstat (limited to 'src/pre.l')
-rw-r--r--src/pre.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pre.l b/src/pre.l
index 979e971..28d8f59 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -3191,7 +3191,7 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName)
def->nonRecursive = nonRecursive;
def->fileDef = state->yyFileDef;
def->fileName = fileName;
- state->contextDefines.insert(std::make_pair(state->yyFileName.str(),std::move(def)));
+ state->contextDefines.insert(std::make_pair(toStdString(def->name),std::move(def)));
//printf("#define '%s' '%s' #nargs=%d\n",
// def->name.data(),def->definition.data(),def->nargs);
@@ -3223,7 +3223,7 @@ static void initPredefined(yyscan_t yyscanner,const char *fileName)
def->nonRecursive = nonRecursive;
def->fileDef = state->yyFileDef;
def->fileName = fileName;
- state->contextDefines.insert(std::make_pair(state->yyFileName.str(),std::move(def)));
+ state->contextDefines.insert(std::make_pair(toStdString(def->name),std::move(def)));
}
}
}