Skip to content

Commit 6a387ef

Browse files
committed
CBD-6348: C++20 std::memory_order namespace is gone
Change-Id: Ib5caa64961ccd33d5fb36fc2584db4796f118d58 Reviewed-on: https://review.couchbase.org/c/kv_engine/+/234573 Well-Formed: Restriction Checker Reviewed-by: Faizan Alam <[email protected]> Tested-by: Trond Norbye <[email protected]>
1 parent ef66e7b commit 6a387ef

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

daemon/stats.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,14 @@ struct stats {
167167
std::atomic<unsigned int> curr_conns;
168168

169169
size_t getCurrConnections() const {
170-
return curr_conns.load(std::memory_order::memory_order_consume);
170+
return curr_conns.load(std::memory_order_consume);
171171
}
172172

173173
/// The number of system connections
174174
std::atomic<unsigned int> system_conns;
175175

176176
size_t getSystemConnections() const {
177-
return system_conns.load(std::memory_order::memory_order_consume);
177+
return system_conns.load(std::memory_order_consume);
178178
}
179179

180180
size_t getUserConnections() const {

engines/ep/src/durability_timeout_task.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class DurabilityTimeoutTask : public GlobalTask {
5656
// has its internal sleep-time which is used for a different purpose,
5757
// details in VBCBAdaptor.
5858
cb::AtomicDuration<std::chrono::milliseconds,
59-
std::memory_order::memory_order_seq_cst>
59+
std::memory_order_seq_cst>
6060
sleepTime;
6161
};
6262

0 commit comments

Comments
 (0)