File tree Expand file tree Collapse file tree 3 files changed +18
-1
lines changed
src/mongocxx/lib/mongocxx/v_noabi/mongocxx/private Expand file tree Collapse file tree 3 files changed +18
-1
lines changed Original file line number Diff line number Diff line change @@ -33,6 +33,9 @@ namespace libmongoc {
33
33
#include " libmongoc_symbols.hh"
34
34
#undef MONGOCXX_LIBMONGOC_SYMBOL
35
35
36
+ mongocxx::test_util::mock<log_set_handler_cdecl_t >& log_set_handler =
37
+ *new test_util::mock<log_set_handler_cdecl_t >(mongoc_log_set_handler);
38
+
36
39
#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__)
37
40
#pragma GCC diagnostic pop
38
41
#endif
Original file line number Diff line number Diff line change @@ -59,6 +59,17 @@ namespace libmongoc {
59
59
#include " libmongoc_symbols.hh"
60
60
#undef MONGOCXX_LIBMONGOC_SYMBOL
61
61
62
+ // CDRIVER-5678
63
+ using log_func_cdecl_t = void (MONGOCXX_ABI_CDECL*)(mongoc_log_level_t log_level,
64
+ const char * log_domain,
65
+ const char * message,
66
+ void * user_data);
67
+ using log_set_handler_cdecl_t = void (MONGOCXX_ABI_CDECL*)(log_func_cdecl_t log_func,
68
+ void * user_data);
69
+
70
+ extern MONGOCXX_ABI_EXPORT_TESTING mongocxx::test_util::mock<log_set_handler_cdecl_t >&
71
+ log_set_handler;
72
+
62
73
#if defined(__GNUC__) && (__GNUC__ >= 6) && !defined(__clang__)
63
74
#pragma GCC diagnostic pop
64
75
#endif
@@ -69,6 +80,9 @@ namespace libmongoc {
69
80
#include " libmongoc_symbols.hh"
70
81
#undef MONGOCXX_LIBMONGOC_SYMBOL
71
82
83
+ // CDRIVER-5678
84
+ constexpr auto log_set_handler = mongoc_log_set_handler;
85
+
72
86
#endif
73
87
74
88
} // namespace libmongoc
Original file line number Diff line number Diff line change @@ -278,7 +278,7 @@ MONGOCXX_LIBMONGOC_SYMBOL(index_opt_geo_init)
278
278
MONGOCXX_LIBMONGOC_SYMBOL(index_opt_init)
279
279
MONGOCXX_LIBMONGOC_SYMBOL(index_opt_wt_init)
280
280
MONGOCXX_LIBMONGOC_SYMBOL(init)
281
- MONGOCXX_LIBMONGOC_SYMBOL(log_set_handler)
281
+ // MONGOCXX_LIBMONGOC_SYMBOL(log_set_handler) // CDRIVER-5678: not __cdecl.
282
282
MONGOCXX_LIBMONGOC_SYMBOL(read_concern_copy)
283
283
MONGOCXX_LIBMONGOC_SYMBOL(read_concern_destroy)
284
284
MONGOCXX_LIBMONGOC_SYMBOL(read_concern_get_level)
You can’t perform that action at this time.
0 commit comments