Skip to content

Commit 88bd454

Browse files
committed
Cleanup Doxygen::terminating
Variable was introduced in doxygen 1.9.4 and used in in doxygen.h in the function `NonTerminatingDeleter` "Deleter that only deletes an object if doxygen is not already terminating" It was removed in doxygen 1.8.8 with: ``` Commit: bcc35bd [bcc35bd] Date: Sunday, May 21, 2023 3:02:22 PM Refactoring: replace DotRunnerQueue and DotWorkerThread by ThreadPool ``` though the variable `Doxygen::terminating` remained and was only set but not used. It was used in the past in dot.h in `using DotWorkerThreadPtr = std::unique_ptr< DotWorkerThread, NonTerminatingDeleter<DotWorkerThread > >;`
1 parent 6374856 commit 88bd454

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

src/doxygen.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ bool Doxygen::generatingXmlOutput = FALSE;
168168
DefinesPerFileList Doxygen::macroDefinitions;
169169
bool Doxygen::clangAssistedParsing = FALSE;
170170
QCString Doxygen::verifiedDotPath;
171-
volatile bool Doxygen::terminating = false;
172171
InputFileEncodingList Doxygen::inputFileEncodingList;
173172
std::mutex Doxygen::countFlowKeywordsMutex;
174173
std::mutex Doxygen::addExampleMutex;
@@ -11450,7 +11449,6 @@ static void stopDoxygen(int)
1145011449
}
1145111450
killpg(0,SIGINT);
1145211451
cleanUpDoxygen();
11453-
Doxygen::terminating=true;
1145411452
exitTracing();
1145511453
exit(1);
1145611454
}

src/doxygen.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ class Doxygen
127127
static DefinesPerFileList macroDefinitions;
128128
static bool clangAssistedParsing;
129129
static QCString verifiedDotPath;
130-
static volatile bool terminating;
131130
static InputFileEncodingList inputFileEncodingList;
132131
static std::mutex countFlowKeywordsMutex;
133132
static std::mutex addExampleMutex;

src/message.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ static void format_warn(const QCString &file,int line,const QCString &text)
145145
}
146146
if (g_warnBehavior == WARN_AS_ERROR_t::YES)
147147
{
148-
Doxygen::terminating=true;
149148
exit(1);
150149
}
151150
g_warnStat = true;
@@ -160,7 +159,6 @@ static void handle_warn_as_error()
160159
QCString msgText = " (warning treated as error, aborting now)\n";
161160
fwrite(msgText.data(),1,msgText.length(),g_warnFile);
162161
}
163-
Doxygen::terminating=true;
164162
exit(1);
165163
}
166164
g_warnStat = true;
@@ -285,7 +283,6 @@ void term_(const char *fmt, ...)
285283
fprintf(g_warnFile, "%s\n", "Exiting...");
286284
}
287285
}
288-
Doxygen::terminating=true;
289286
exit(1);
290287
}
291288

@@ -329,7 +326,6 @@ extern void finishWarnExit()
329326
if (g_warnStat && (g_warnBehavior == WARN_AS_ERROR_t::FAIL_ON_WARNINGS ||
330327
g_warnBehavior == WARN_AS_ERROR_t::FAIL_ON_WARNINGS_PRINT))
331328
{
332-
Doxygen::terminating=true;
333329
exit(1);
334330
}
335331
}

0 commit comments

Comments
 (0)