Skip to content

Commit 49991c4

Browse files
committed
replace inline with BSON_INLINE (#1661)
To fix build on VS 2013. Replaces `inline` added in CDRIVER-5604 and CDRIVER-5607.
1 parent d83911e commit 49991c4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/libbson/src/bson/bson-oid.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ BSON_MAYBE_UNUSED static const uint16_t gHexCharPairs[] = {
7676
#endif
7777
};
7878

79-
static inline void
79+
static BSON_INLINE void
8080
_oid_init (bson_oid_t *oid, bson_context_t *context, bool add_random)
8181
{
8282
BSON_ASSERT (oid);

src/libmongoc/src/mongoc/mongoc-topology-private.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ _mongoc_topology_set_rr_resolver (mongoc_topology_t *topology, _mongoc_rr_resolv
445445
/**
446446
* @brief Thread-safe update the SRV polling rescan interval on the given topology
447447
*/
448-
static inline void
448+
static BSON_INLINE void
449449
_mongoc_topology_set_srv_polling_rescan_interval_ms (mongoc_topology_t *topology, int64_t val)
450450
{
451451
bson_atomic_int64_exchange (&topology->_atomic_srv_polling_rescan_interval_ms, val, bson_memory_order_seq_cst);
@@ -454,7 +454,7 @@ _mongoc_topology_set_srv_polling_rescan_interval_ms (mongoc_topology_t *topology
454454
/**
455455
* @brief Thread-safe get the SRV polling interval
456456
*/
457-
static inline int64_t
457+
static BSON_INLINE int64_t
458458
_mongoc_topology_get_srv_polling_rescan_interval_ms (mongoc_topology_t const *topology)
459459
{
460460
return bson_atomic_int64_fetch (&topology->_atomic_srv_polling_rescan_interval_ms, bson_memory_order_seq_cst);

0 commit comments

Comments
 (0)