From c30fbe4eba7f27c6296dea587eefe3d8b489661a Mon Sep 17 00:00:00 2001
From: albert-github <albert.tests@gmail.com>
Date: Thu, 2 Jul 2020 12:22:00 +0200
Subject: issue #7890 Macro Expansion broken
The defines from the doxygen configuration file were not taken into account du a wrong primary key.
---
src/pre.l | 4 ++--
1 file 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)));
}
}
}
--
cgit v0.12