Skip to content

Commit 91b9d75

Browse files
authored
CXX-3201 remove Doxygen workarounds for using-declarations (#1309)
* Set DOXYGEN_BINARY to 1.13.1 * Upgrade Doxygen config to 1.13.1 * set IMPLICIT_DIR_DOCS = NO * Upgrade Doxygen layout file to 1.13.1 * Remove Doxygen preprocessor declarations * Avoid documenting std namespace entities
1 parent 2f17286 commit 91b9d75

File tree

159 files changed

+405
-2727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+405
-2727
lines changed

Doxyfile

Lines changed: 267 additions & 244 deletions
Large diffs are not rendered by default.

docs/DoxygenLayout.xml

Lines changed: 121 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<doxygenlayout version="1.0">
3-
<!-- Generated by doxygen 1.11.0 -->
2+
<doxygenlayout version="2.0">
3+
<!-- Generated by doxygen 1.13.1 -->
44
<!-- Navigation index tabs for HTML output -->
55
<navindex>
66
<tab type="mainpage" visible="yes" title=""/>
@@ -29,7 +29,7 @@
2929
<tab type="hierarchy" visible="yes" title="" intro=""/>
3030
<tab type="classmembers" visible="yes" title="" intro=""/>
3131
</tab>
32-
<tab type="topics" visible="yes" title="Groups" intro="Pages documenting groups of related entities."/>
32+
<tab type="topics" visible="yes" title="Groups" intro="Pages documenting groups of related entities."/>
3333
<tab type="pages" visible="yes" title="Topics" intro="Pages documenting topics related to the API."/>
3434
<tab type="structs" visible="yes" title="">
3535
<tab type="structlist" visible="yes" title="" intro=""/>
@@ -47,55 +47,55 @@
4747
<class>
4848
<briefdescription visible="no"/>
4949
<includes visible="$SHOW_HEADERFILE"/>
50-
<detaileddescription title="Description"/>
50+
<detaileddescription visible="yes" title="Description"/>
5151
<inheritancegraph visible="yes"/>
5252
<collaborationgraph visible="yes"/>
5353
<memberdecl>
5454
<nestedclasses visible="yes" title=""/>
55-
<publictypes title=""/>
56-
<services title=""/>
57-
<interfaces title=""/>
58-
<publicslots title=""/>
59-
<signals title=""/>
60-
<publicmethods title=""/>
61-
<publicstaticmethods title=""/>
62-
<publicattributes title=""/>
63-
<publicstaticattributes title=""/>
64-
<protectedtypes title=""/>
65-
<protectedslots title=""/>
66-
<protectedmethods title=""/>
67-
<protectedstaticmethods title=""/>
68-
<protectedattributes title=""/>
69-
<protectedstaticattributes title=""/>
70-
<packagetypes title=""/>
71-
<packagemethods title=""/>
72-
<packagestaticmethods title=""/>
73-
<packageattributes title=""/>
74-
<packagestaticattributes title=""/>
75-
<properties title=""/>
76-
<events title=""/>
77-
<privatetypes title=""/>
78-
<privateslots title=""/>
79-
<privatemethods title=""/>
80-
<privatestaticmethods title=""/>
81-
<privateattributes title=""/>
82-
<privatestaticattributes title=""/>
83-
<friends title=""/>
84-
<related title="" subtitle=""/>
55+
<publictypes visible="yes" title=""/>
56+
<services visible="yes" title=""/>
57+
<interfaces visible="yes" title=""/>
58+
<publicslots visible="yes" title=""/>
59+
<signals visible="yes" title=""/>
60+
<publicmethods visible="yes" title=""/>
61+
<publicstaticmethods visible="yes" title=""/>
62+
<publicattributes visible="yes" title=""/>
63+
<publicstaticattributes visible="yes" title=""/>
64+
<protectedtypes visible="yes" title=""/>
65+
<protectedslots visible="yes" title=""/>
66+
<protectedmethods visible="yes" title=""/>
67+
<protectedstaticmethods visible="yes" title=""/>
68+
<protectedattributes visible="yes" title=""/>
69+
<protectedstaticattributes visible="yes" title=""/>
70+
<packagetypes visible="yes" title=""/>
71+
<packagemethods visible="yes" title=""/>
72+
<packagestaticmethods visible="yes" title=""/>
73+
<packageattributes visible="yes" title=""/>
74+
<packagestaticattributes visible="yes" title=""/>
75+
<properties visible="yes" title=""/>
76+
<events visible="yes" title=""/>
77+
<privatetypes visible="yes" title=""/>
78+
<privateslots visible="yes" title=""/>
79+
<privatemethods visible="yes" title=""/>
80+
<privatestaticmethods visible="yes" title=""/>
81+
<privateattributes visible="yes" title=""/>
82+
<privatestaticattributes visible="yes" title=""/>
83+
<friends visible="yes" title=""/>
84+
<related visible="yes" title="" subtitle=""/>
8585
<membergroups visible="yes"/>
8686
</memberdecl>
8787
<memberdef>
88-
<inlineclasses title=""/>
89-
<typedefs title=""/>
90-
<enums title=""/>
91-
<services title=""/>
92-
<interfaces title=""/>
93-
<constructors title=""/>
94-
<functions title=""/>
95-
<related title=""/>
96-
<variables title=""/>
97-
<properties title=""/>
98-
<events title=""/>
88+
<inlineclasses visible="yes" title=""/>
89+
<typedefs visible="yes" title=""/>
90+
<enums visible="yes" title=""/>
91+
<services visible="yes" title=""/>
92+
<interfaces visible="yes" title=""/>
93+
<constructors visible="yes" title=""/>
94+
<functions visible="yes" title=""/>
95+
<related visible="yes" title=""/>
96+
<variables visible="yes" title=""/>
97+
<properties visible="yes" title=""/>
98+
<events visible="yes" title=""/>
9999
</memberdef>
100100
<allmemberslink visible="yes"/>
101101
<usedfiles visible="$SHOW_USED_FILES"/>
@@ -105,7 +105,7 @@
105105
<!-- Layout definition for a namespace page -->
106106
<namespace>
107107
<briefdescription visible="no"/>
108-
<detaileddescription title="Description"/>
108+
<detaileddescription visible="yes" title="Description"/>
109109
<memberdecl>
110110
<nestednamespaces visible="yes" title=""/>
111111
<constantgroups visible="yes" title=""/>
@@ -114,24 +114,24 @@
114114
<concepts visible="yes" title=""/>
115115
<structs visible="yes" title=""/>
116116
<exceptions visible="yes" title=""/>
117-
<typedefs title=""/>
118-
<sequences title=""/>
119-
<dictionaries title=""/>
120-
<enums title=""/>
121-
<functions title=""/>
122-
<variables title=""/>
123-
<properties title=""/>
124-
<membergroups visible="yes"/>
117+
<typedefs visible="yes" title=""/>
118+
<sequences visible="yes" title=""/>
119+
<dictionaries visible="yes" title=""/>
120+
<enums visible="yes" title=""/>
121+
<functions visible="yes" title=""/>
122+
<variables visible="yes" title=""/>
123+
<properties visible="yes" title=""/>
124+
<membergroups visible="yes" visible="yes"/>
125125
</memberdecl>
126126
<memberdef>
127-
<inlineclasses title=""/>
128-
<typedefs title=""/>
129-
<sequences title=""/>
130-
<dictionaries title=""/>
131-
<enums title=""/>
132-
<functions title=""/>
133-
<variables title=""/>
134-
<properties title=""/>
127+
<inlineclasses visible="yes" title=""/>
128+
<typedefs visible="yes" title=""/>
129+
<sequences visible="yes" title=""/>
130+
<dictionaries visible="yes" title=""/>
131+
<enums visible="yes" title=""/>
132+
<functions visible="yes" title=""/>
133+
<variables visible="yes" title=""/>
134+
<properties visible="yes" title=""/>
135135
</memberdef>
136136
<authorsection visible="yes"/>
137137
</namespace>
@@ -141,14 +141,14 @@
141141
<briefdescription visible="yes"/>
142142
<includes visible="$SHOW_HEADERFILE"/>
143143
<definition visible="yes" title=""/>
144-
<detaileddescription title=""/>
144+
<detaileddescription visible="yes" title=""/>
145145
<authorsection visible="yes"/>
146146
</concept>
147147

148148
<!-- Layout definition for a file page -->
149149
<file>
150150
<briefdescription visible="no"/>
151-
<detaileddescription title="Description"/>
151+
<detaileddescription visible="yes" title="Description"/>
152152
<includes visible="$SHOW_INCLUDE_FILES"/>
153153
<includegraph visible="yes"/>
154154
<includedbygraph visible="yes"/>
@@ -161,34 +161,34 @@
161161
<namespaces visible="yes" title=""/>
162162
<concepts visible="yes" title=""/>
163163
<constantgroups visible="yes" title=""/>
164-
<defines title=""/>
165-
<typedefs title=""/>
166-
<sequences title=""/>
167-
<dictionaries title=""/>
168-
<enums title=""/>
169-
<functions title=""/>
170-
<variables title=""/>
171-
<properties title=""/>
172-
<membergroups visible="yes"/>
164+
<defines visible="yes" title=""/>
165+
<typedefs visible="yes" title=""/>
166+
<sequences visible="yes" title=""/>
167+
<dictionaries visible="yes" title=""/>
168+
<enums visible="yes" title=""/>
169+
<functions visible="yes" title=""/>
170+
<variables visible="yes" title=""/>
171+
<properties visible="yes" title=""/>
172+
<membergroups visible="yes" visible="yes"/>
173173
</memberdecl>
174174
<memberdef>
175-
<inlineclasses title=""/>
176-
<defines title=""/>
177-
<typedefs title=""/>
178-
<sequences title=""/>
179-
<dictionaries title=""/>
180-
<enums title=""/>
181-
<functions title=""/>
182-
<variables title=""/>
183-
<properties title=""/>
175+
<inlineclasses visible="yes" title=""/>
176+
<defines visible="yes" title=""/>
177+
<typedefs visible="yes" title=""/>
178+
<sequences visible="yes" title=""/>
179+
<dictionaries visible="yes" title=""/>
180+
<enums visible="yes" title=""/>
181+
<functions visible="yes" title=""/>
182+
<variables visible="yes" title=""/>
183+
<properties visible="yes" title=""/>
184184
</memberdef>
185185
<authorsection/>
186186
</file>
187187

188188
<!-- Layout definition for a group page -->
189189
<group>
190190
<briefdescription visible="no"/>
191-
<detaileddescription title="Description"/>
191+
<detaileddescription visible="yes" title="Description"/>
192192
<groupgraph visible="yes"/>
193193
<memberdecl>
194194
<nestedgroups visible="yes" title=""/>
@@ -198,41 +198,41 @@
198198
<namespaces visible="yes" title=""/>
199199
<concepts visible="yes" title=""/>
200200
<classes visible="yes" title=""/>
201-
<defines title=""/>
202-
<typedefs title=""/>
203-
<sequences title=""/>
204-
<dictionaries title=""/>
205-
<enums title=""/>
206-
<enumvalues title=""/>
207-
<functions title=""/>
208-
<variables title=""/>
209-
<signals title=""/>
210-
<publicslots title=""/>
211-
<protectedslots title=""/>
212-
<privateslots title=""/>
213-
<events title=""/>
214-
<properties title=""/>
215-
<friends title=""/>
201+
<defines visible="yes" title=""/>
202+
<typedefs visible="yes" title=""/>
203+
<sequences visible="yes" title=""/>
204+
<dictionaries visible="yes" title=""/>
205+
<enums visible="yes" title=""/>
206+
<enumvalues visible="yes" title=""/>
207+
<functions visible="yes" title=""/>
208+
<variables visible="yes" title=""/>
209+
<signals visible="yes" title=""/>
210+
<publicslots visible="yes" title=""/>
211+
<protectedslots visible="yes" title=""/>
212+
<privateslots visible="yes" title=""/>
213+
<events visible="yes" title=""/>
214+
<properties visible="yes" title=""/>
215+
<friends visible="yes" title=""/>
216216
<membergroups visible="yes"/>
217217
</memberdecl>
218218
<memberdef>
219219
<pagedocs/>
220-
<inlineclasses title=""/>
221-
<defines title=""/>
222-
<typedefs title=""/>
223-
<sequences title=""/>
224-
<dictionaries title=""/>
225-
<enums title=""/>
226-
<enumvalues title=""/>
227-
<functions title=""/>
228-
<variables title=""/>
229-
<signals title=""/>
230-
<publicslots title=""/>
231-
<protectedslots title=""/>
232-
<privateslots title=""/>
233-
<events title=""/>
234-
<properties title=""/>
235-
<friends title=""/>
220+
<inlineclasses visible="yes" title=""/>
221+
<defines visible="yes" title=""/>
222+
<typedefs visible="yes" title=""/>
223+
<sequences visible="yes" title=""/>
224+
<dictionaries visible="yes" title=""/>
225+
<enums visible="yes" title=""/>
226+
<enumvalues visible="yes" title=""/>
227+
<functions visible="yes" title=""/>
228+
<variables visible="yes" title=""/>
229+
<signals visible="yes" title=""/>
230+
<publicslots visible="yes" title=""/>
231+
<protectedslots visible="yes" title=""/>
232+
<privateslots visible="yes" title=""/>
233+
<events visible="yes" title=""/>
234+
<properties visible="yes" title=""/>
235+
<friends visible="yes" title=""/>
236236
</memberdef>
237237
<authorsection visible="yes"/>
238238
</group>
@@ -244,13 +244,13 @@
244244
<memberdecl>
245245
<concepts visible="yes" title=""/>
246246
<classes visible="yes" title=""/>
247-
<enums title=""/>
248-
<typedefs title=""/>
249-
<functions title=""/>
250-
<variables title=""/>
251-
<membergroups title=""/>
247+
<enums visible="yes" title=""/>
248+
<typedefs visible="yes" title=""/>
249+
<functions visible="yes" title=""/>
250+
<variables visible="yes" title=""/>
251+
<membergroups visible="yes" title=""/>
252252
</memberdecl>
253-
<detaileddescription title=""/>
253+
<detaileddescription visible="yes" title=""/>
254254
<memberdecl>
255255
<files visible="yes"/>
256256
</memberdecl>
@@ -259,7 +259,7 @@
259259
<!-- Layout definition for a directory page -->
260260
<directory>
261261
<briefdescription visible="no"/>
262-
<detaileddescription title="Description"/>
262+
<detaileddescription visible="yes" title="Description"/>
263263
<directorygraph visible="yes"/>
264264
<memberdecl>
265265
<dirs visible="yes"/>

etc/generate-latest-apidocs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set -o errexit
1111
set -o pipefail
1212

1313
LATEST_VERSION="4.0.0"
14-
DOXYGEN_VERSION_REQUIRED="1.12.0"
14+
DOXYGEN_VERSION_REQUIRED="1.13.1"
1515

1616
# Permit using a custom Doxygen binary.
1717
: "${DOXYGEN_BINARY:=doxygen}"

src/bsoncxx/include/bsoncxx/doc.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@
8484
/// Declares entities representing any BSON value type.
8585
///
8686

87-
///
88-
/// @namespace std
89-
/// The top-level namespace reserved for the C++ standard library.
90-
///
91-
9287
///
9388
/// @page topic-bsoncxx The bsoncxx Library
9489
/// @brief Topics relating to the bsoncxx library.

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element-fwd.hpp

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,3 @@ using ::bsoncxx::v_noabi::array::element;
4040
/// @file
4141
/// Declares @ref bsoncxx::v_noabi::array::element.
4242
///
43-
44-
#if defined(BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
45-
46-
namespace bsoncxx {
47-
namespace array {
48-
49-
/// @ref bsoncxx::v_noabi::array::element
50-
class element {};
51-
52-
} // namespace array
53-
} // namespace bsoncxx
54-
55-
#endif // defined(BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR)

0 commit comments

Comments
 (0)