Merge pull request #7891 from albert-github/feature/issue_7890

issue #7890 Macro Expansion broken

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)));
       }
     }
   }