Skip to content

Commit d5f5611

Browse files
committed
Upgrade doxygen configuration
1 parent 30c2be7 commit d5f5611

File tree

5 files changed

+30
-7
lines changed

5 files changed

+30
-7
lines changed

cmake/sanitizers.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ else()
6363
set(CMAKE_REQUIRED_FLAGS /fsanitize=fuzzer)
6464
check_cxx_compiler_flag(/fsanitize=fuzzer HAVE_SANITIZER_FUZZER)
6565
endif()
66-
unset(CMAKE_REQUIRED_FLAGS)
66+
unset(CMAKE_REQUIRED_FLAGS)
6767

6868
if(HAVE_SANITIZER_ADDRESS)
6969
option(SANITIZER_ADDRESS "Build with address sanitizer" ON)

docs/Doxyfile.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2375,7 +2375,9 @@ SKIP_FUNCTION_MACROS = YES
23752375
# the path). If a tag file is not located in the directory in which doxygen is
23762376
# run, you must also specify the path to the tagfile here.
23772377

2378-
TAGFILES = docs/cppreference-doxygen-web.tag.xml=https://en.cppreference.com/w/ docs/corefoundation-doxygen-web.tag.xml=https://developer.apple.com/documentation/corefoundation/ docs/magic_enum-doxygen-web.tag.xml=https://github.com/Neargye/
2378+
TAGFILES = docs/corefoundation-doxygen-web.tag.xml=https://developer.apple.com/documentation/corefoundation/ \
2379+
docs/cppreference-doxygen-web.tag.xml=https://en.cppreference.com/w/ \
2380+
docs/magic_enum-doxygen-web.tag.xml=https://github.com/Neargye/
23792381

23802382
# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
23812383
# tag file that is based on the input files it reads. See section "Linking to

docs/cppreference-doxygen-web.tag.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@
6060
<name>std::enable_if_t</name>
6161
<filename>cpp/types/enable_if</filename>
6262
</compound>
63+
<compound kind="class">
64+
<name>std::error_category</name>
65+
<filename>cpp/error/error_category</filename>
66+
</compound>
67+
<compound kind="class">
68+
<name>std::error_code</name>
69+
<filename>cpp/error/error_code</filename>
70+
</compound>
6371
<compound kind="class">
6472
<name>std::false_type</name>
6573
<filename>cpp/header/type_traits</filename>
@@ -108,6 +116,10 @@
108116
<name>std::ios::app</name>
109117
<filename>cpp/io/ios_base/openmode</filename>
110118
</compound>
119+
<compound kind="class">
120+
<name>std::is_error_code_enum</name>
121+
<filename>cpp/error/error_code/is_error_code_enum</filename>
122+
</compound>
111123
<compound kind="class">
112124
<name>std::is_floating_point_v</name>
113125
<filename>cpp/types/is_floating_point</filename>

docs/post_doxygen.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
# Fix all .html files
4444
for file in os.listdir(folder):
4545
if file.endswith('.html'):
46-
f = open(os.path.join(folder, file), 'r')
46+
f = open(os.path.join(folder, file), 'r', errors='ignore')
4747
filedata = f.read()
4848
f.close()
4949

@@ -54,10 +54,15 @@
5454
if pos == -1:
5555
break
5656

57-
replace = filedata.find('.html"', pos + 1)
57+
replace = filedata.find('.html"', pos)
5858
if replace == -1:
5959
continue
6060

61+
# except sqlite functions
62+
if 'sqlite' in filedata[pos:replace]:
63+
filedata = filedata[:replace+6] + ' target="_blank"' + filedata[replace+6:]
64+
continue
65+
6166
filedata = filedata[:replace] + '" target="_blank"' + filedata[replace+6:]
6267

6368
f = open(os.path.join(folder, file),'w')
@@ -67,7 +72,7 @@
6772
# Fix all .js files
6873
for file in os.listdir(folder):
6974
if file.endswith('.js'):
70-
f = open(os.path.join(folder, file), 'r')
75+
f = open(os.path.join(folder, file), 'r', errors='ignore')
7176
filedata = f.read()
7277
f.close()
7378

@@ -82,7 +87,11 @@
8287
if replace == -1:
8388
continue
8489

85-
filedata = filedata[:replace] + '"' + filedata[replace+6:]
90+
# except sqlite functions
91+
if 'sqlite' in filedata[pos:replace]:
92+
continue
93+
94+
filedata = filedata[:replace] + '"' + filedata[replace + 6]
8695

8796
f = open(os.path.join(folder, file),'w')
8897
f.write(filedata)

tests/template/test_main_cppunit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Test : public CppUnit::TestCase {
7676
#pragma clang diagnostic pop
7777
#endif
7878

79-
int main() {
79+
std::int32_t main() {
8080

8181
CppUnit::TextUi::TestRunner runner;
8282
runner.addTest( Test::suite() );

0 commit comments

Comments
 (0)