Skip to content

Commit 652b853

Browse files
committed
Merge remote-tracking branch 'couchbase/morpheus'
* couchbase/morpheus: MB-69467: Fix build issues on Tahoe Change-Id: I9149b6a7d6dff0e1751a136ab2843d8cc07dbc3c
2 parents fe3581e + 1976229 commit 652b853

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

include/platform/non_negative_counter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
*/
1010
#pragma once
1111

12+
#include <platform/exceptions.h>
1213
#include <atomic>
14+
#include <cstdlib>
1315
#include <limits>
1416
#include <stdexcept>
1517
#include <string>
1618
#include <type_traits>
17-
#include <platform/exceptions.h>
1819

1920
namespace cb {
2021

src/byte_buffer_dump.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
#include <platform/byte_buffer_dump.h>
1111
#include <iomanip>
12+
#include <ostream>
1213

1314
static void printByte(uint8_t b, std::ostream& out) {
1415
uint32_t val = b & 0xff;

0 commit comments

Comments
 (0)