Skip to content

Commit c386647

Browse files
authored
doxygen: predefine non-standard specifiers and fix include paths (#1355)
1 parent 7a0215b commit c386647

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

Doxyfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2412,7 +2412,9 @@ SEARCH_INCLUDES = YES
24122412
# RECURSIVE has no effect here.
24132413
# This tag requires that the tag SEARCH_INCLUDES is set to YES.
24142414

2415-
INCLUDE_PATH = build/doxygen/install/include
2415+
INCLUDE_PATH = build/doxygen/install/include/bsoncxx/v_noabi \
2416+
build/doxygen/install/include/mongocxx/v_noabi \
2417+
build/doxygen/install/include
24162418

24172419
# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
24182420
# patterns (like *.h and *.hpp) to filter out the header-files in the
@@ -2430,13 +2432,11 @@ INCLUDE_FILE_PATTERNS =
24302432
# recursively expanded use the := operator instead of the = operator.
24312433
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
24322434

2433-
PREDEFINED = BSONCXX_ABI_CDECL= \
2434-
BSONCXX_ABI_EXPORT= \
2435-
BSONCXX_ABI_EXPORT_CDECL(...)=__VA_ARGS__ \
2435+
PREDEFINED = __attribute__(...)= \
2436+
__declspec(...)= \
2437+
_Pragma(...)= \
2438+
__pragma(...)= \
24362439
BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR= \
2437-
MONGOCXX_ABI_CDECL= \
2438-
MONGOCXX_ABI_EXPORT= \
2439-
MONGOCXX_ABI_EXPORT_CDECL(...)=__VA_ARGS__ \
24402440
MONGOCXX_PRIVATE_DOXYGEN_PREPROCESSOR=
24412441

24422442
# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this

src/bsoncxx/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ if(1)
153153
/// @warning For internal use only!
154154
///
155155
156-
// Doxygen `PREDEFINED` does not define the macro *in code* as required by `@def`.
157-
#if defined(BSONCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
158-
#define BSONCXX_ABI_EXPORT ...
159-
#endif
160-
161156
///
162157
/// @def BSONCXX_ABI_EXPORT
163158
/// @hideinitializer

src/mongocxx/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ if(1)
121121
122122
#define MONGOCXX_ABI_EXPORT_CDECL(...) MONGOCXX_ABI_EXPORT __VA_ARGS__ MONGOCXX_ABI_CDECL
123123
124-
// Doxygen `PREDEFINED` does not define the macro *in code* as required by `@def`.
125-
#if defined(MONGOCXX_PRIVATE_DOXYGEN_PREPROCESSOR)
126-
#define MONGOCXX_ABI_EXPORT ...
127-
#endif
128-
129124
///
130125
/// @file
131126
/// Provides macros to control the set of symbols exported in the ABI.

0 commit comments

Comments
 (0)