Skip to content

Commit 9c6b113

Browse files
committed
issue #10997 How to tell Doxygen to process an #include within a class definition
1 parent 6ae0631 commit 9c6b113

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/markdown.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,9 +691,9 @@ size_t Markdown::Private::findEmphasisChar(std::string_view data, char c, size_t
691691

692692
if (len>0)
693693
{
694-
if (len!=c_size || (i<size-len && isIdChar(data[i+len]))) // to prevent touching some_underscore_identifier
694+
if (len!=c_size || (i+len<size && isIdChar(data[i+len]))) // to prevent touching some_underscore_identifier
695695
{
696-
i=i+len;
696+
i+=len;
697697
continue;
698698
}
699699
AUTO_TRACE_EXIT("result={}",i);
@@ -736,7 +736,7 @@ size_t Markdown::Private::findEmphasisChar(std::string_view data, char c, size_t
736736
i++;
737737
}
738738
}
739-
else if (i<size-1 && isIdChar(data[i+1])) // @cmd, stop processing, see bug 690385
739+
else if (i+1<size && isIdChar(data[i+1])) // @cmd, stop processing, see bug 690385
740740
{
741741
return 0;
742742
}

src/pre.l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3633,7 +3633,7 @@ static void readIncludeFile(yyscan_t yyscanner,const QCString &inc)
36333633
}
36343634
//printf("error: include file %s not found\n",yytext);
36353635
}
3636-
if (state->curlyCount>0 && !alreadyProcessed) // failed to find #include inside { ... }
3636+
if (localInclude && !state->includeStack.empty() && state->curlyCount>0 && !alreadyProcessed) // failed to find #include inside { ... }
36373637
{
36383638
warn(state->fileName,state->yyLineNr,"include file %s not found, perhaps you forgot to add its directory to INCLUDE_PATH?",qPrint(incFileName));
36393639
}

0 commit comments

Comments
 (0)