055702ad13
Add BuildRequires on lz4-devel and xxhash-devel Workaround for missing gmock libraries only needed for gmock < 0.1.8 Address some warnings during documentation generation
86 lines
3.1 KiB
Diff
86 lines
3.1 KiB
Diff
From 44ca9d32d47782597e58e75575fdffba135ab8e7 Mon Sep 17 00:00:00 2001
|
|
From: Mattias Ellert <mattias.ellert@physics.uu.se>
|
|
Date: Wed, 18 Oct 2017 13:34:34 +0200
|
|
Subject: [PATCH] Fix \cond without \endcond warnings
|
|
|
|
---
|
|
documentation/doxygen/filter.cxx | 21 +++++++++++++--------
|
|
1 file changed, 13 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/documentation/doxygen/filter.cxx b/documentation/doxygen/filter.cxx
|
|
index 85309dd6f7..de8acb4bc9 100644
|
|
--- a/documentation/doxygen/filter.cxx
|
|
+++ b/documentation/doxygen/filter.cxx
|
|
@@ -107,7 +107,6 @@ bool gImageSource; // True the source of the current macro should be shown
|
|
int gInMacro; // >0 if parsing a macro in a class documentation.
|
|
int gImageID; // Image Identifier.
|
|
int gMacroID; // Macro identifier in class documentation.
|
|
-int gShowTutSource; // >0 if the tutorial source code should be shown
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
@@ -126,7 +125,6 @@ int main(int argc, char *argv[])
|
|
gMacroID = 0;
|
|
gOutputName = "stdout.dat";
|
|
gImageType = "png";
|
|
- gShowTutSource = 0;
|
|
if (EndsWith(gFileName,".cxx")) gSource = true;
|
|
if (EndsWith(gFileName,".h")) gHeader = true;
|
|
if (EndsWith(gFileName,".py")) gPython = true;
|
|
@@ -273,6 +271,9 @@ void FilterTutorial()
|
|
// File for inline macros.
|
|
FILE *m = 0;
|
|
|
|
+ int showTutSource = 0;
|
|
+ int incond = 0;
|
|
+
|
|
// Extract the macro name
|
|
int i1 = gFileName.rfind('/')+1;
|
|
int i2 = gFileName.rfind('C');
|
|
@@ -311,7 +312,7 @@ void FilterTutorial()
|
|
|
|
// \macro_code found
|
|
if (gLineString.find("\\macro_code") != string::npos) {
|
|
- gShowTutSource = 1;
|
|
+ showTutSource = 1;
|
|
m = fopen(StringFormat("%s/macros/%s",gOutDir.c_str(),gMacroName.c_str()).c_str(), "w");
|
|
ReplaceAll(gLineString, "\\macro_code", StringFormat("\\include %s",gMacroName.c_str()));
|
|
}
|
|
@@ -339,19 +340,23 @@ void FilterTutorial()
|
|
}
|
|
|
|
// \author is the last comment line.
|
|
- if (gLineString.find("\\author") != string::npos) {
|
|
+ if (gLineString.find("\\author") != string::npos) {
|
|
if (gPython) printf("%s",StringFormat("%s \n## \\cond \n",gLineString.c_str()).c_str());
|
|
else printf("%s",StringFormat("%s \n/// \\cond \n",gLineString.c_str()).c_str());
|
|
- if (gShowTutSource == 1) gShowTutSource = 2;
|
|
+ if (showTutSource == 1) showTutSource = 2;
|
|
+ incond = 1;
|
|
} else {
|
|
printf("%s",gLineString.c_str());
|
|
- if (m && gShowTutSource == 2) fprintf(m,"%s",gLineString.c_str());
|
|
+ if (m && showTutSource == 2) fprintf(m,"%s",gLineString.c_str());
|
|
}
|
|
}
|
|
|
|
- if (m) {
|
|
+ if (incond) {
|
|
if (gPython) printf("## \\endcond \n");
|
|
else printf("/// \\endcond \n");
|
|
+ }
|
|
+
|
|
+ if (m) {
|
|
fclose(m);
|
|
}
|
|
}
|
|
@@ -511,4 +516,4 @@ bool EndsWith(string const &fullString, string const &ending) {
|
|
|
|
bool BeginsWith(const string& haystack, const string& needle) {
|
|
return needle.length() <= haystack.length() && equal(needle.begin(), needle.end(), haystack.begin());
|
|
-}
|
|
\ No newline at end of file
|
|
+}
|
|
--
|
|
2.13.6
|
|
|