summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Chen <luke.chen@mongodb.com>2021-07-16 15:30:44 +1000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-07-16 06:02:32 +0000
commit8fc6fc1c991cad5bebcace91ee219a9ea7057108 (patch)
tree8a11f71df54a2dd8410a1b2f53e6fd10ee8364c3
parent90328ab3de8b23362a113a0d76a5e0f17f50108a (diff)
downloadmongo-8fc6fc1c991cad5bebcace91ee219a9ea7057108.tar.gz
Import wiredtiger: 24b148776d00f38bc566d8fd74b038d64d4bdd4c from branch mongodb-master
ref: 3920a8bd07..24b148776d for: 5.1.0 WT-7843 Add missing macros to define PRIxMAX
-rw-r--r--src/third_party/wiredtiger/import.data2
-rw-r--r--src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h4
-rw-r--r--src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h4
3 files changed, 9 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data
index 4bfc4e4e029..f612385a00d 100644
--- a/src/third_party/wiredtiger/import.data
+++ b/src/third_party/wiredtiger/import.data
@@ -2,5 +2,5 @@
"vendor": "wiredtiger",
"github": "wiredtiger/wiredtiger.git",
"branch": "mongodb-master",
- "commit": "3920a8bd073ed718a1c3c4df7e073fda4da3822f"
+ "commit": "24b148776d00f38bc566d8fd74b038d64d4bdd4c"
}
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h
index 790c8837993..c6245160df1 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/connection_manager.h
@@ -29,6 +29,10 @@
#ifndef CONN_API_H
#define CONN_API_H
+/* Following definitions are required in order to use printing format specifiers in C++. */
+#define __STDC_LIMIT_MACROS
+#define __STDC_FORMAT_MACROS
+
#include <mutex>
extern "C" {
diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h
index 5bf4c6370ca..47b8592ede0 100644
--- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h
+++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/scoped_types.h
@@ -29,6 +29,10 @@
#ifndef SCOPED_TYPES_H
#define SCOPED_TYPES_H
+/* Following definitions are required in order to use printing format specifiers in C++. */
+#define __STDC_LIMIT_MACROS
+#define __STDC_FORMAT_MACROS
+
extern "C" {
#include "test_util.h"
}