diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2021-10-05 15:12:08 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-10-05 04:40:31 +0000 |
| commit | a0bd289488a333dde984b5bf21a1011dd3345d39 (patch) | |
| tree | caab7edb823bc96d36abefb1c25e9e4492496ab5 | |
| parent | 80469adedd382ab8a8d50d0bc9d7f8e756bb8219 (diff) | |
| download | mongo-a0bd289488a333dde984b5bf21a1011dd3345d39.tar.gz | |
Import wiredtiger: 284d0eff1c7fda7c3ba52a989df8049de258d4b4 from branch mongodb-master
ref: 8f54c7f772..284d0eff1c
for: 5.1.0
WT-8115 Define macros only when necessary in cpp files
6 files changed, 27 insertions, 3 deletions
diff --git a/src/third_party/wiredtiger/bench/workgen/workgen.cxx b/src/third_party/wiredtiger/bench/workgen/workgen.cxx index 2f7c0c4f5c4..b1753981540 100644 --- a/src/third_party/wiredtiger/bench/workgen/workgen.cxx +++ b/src/third_party/wiredtiger/bench/workgen/workgen.cxx @@ -26,8 +26,16 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#define __STDC_LIMIT_MACROS // needed to get UINT64_MAX in C++ -#define __STDC_FORMAT_MACROS // needed to get PRIuXX macros in C++ +/* Needed to get UINT64_MAX in C++. */ +#ifndef __STDC_LIMIT_MACROS +#define __STDC_LIMIT_MACROS +#endif + +/* Needed to get PRIuXX macros in C++. */ +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS +#endif + #include <iomanip> #include <iostream> #include <fstream> diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index b784a5d9786..1926f489920 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": "8f54c7f772f96f53413ace85637b1ea4a2a2ed64" + "commit": "284d0eff1c7fda7c3ba52a989df8049de258d4b4" } 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 c6245160df1..ce0c9598318 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 @@ -30,8 +30,12 @@ #define CONN_API_H /* Following definitions are required in order to use printing format specifiers in C++. */ +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include <mutex> diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.h index 8d67bfd7e27..2c35ef0d162 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.h +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/util/logger.h @@ -30,8 +30,12 @@ #define DEBUG_UTILS_H /* Following definitions are required in order to use printing format specifiers in C++. */ +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include <chrono> #include <iostream> 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 47b8592ede0..edb38e3e22c 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 @@ -30,8 +30,12 @@ #define SCOPED_TYPES_H /* Following definitions are required in order to use printing format specifiers in C++. */ +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif extern "C" { #include "test_util.h" diff --git a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.h b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.h index 31f44bbe98e..967d5566ce1 100644 --- a/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.h +++ b/src/third_party/wiredtiger/test/cppsuite/test_harness/workload/random_generator.h @@ -30,8 +30,12 @@ #define RANDOM_GENERATOR_H /* Following definitions are required in order to use printing format specifiers in C++. */ +#ifndef __STDC_LIMIT_MACROS #define __STDC_LIMIT_MACROS +#endif +#ifndef __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS +#endif #include <random> #include <string> |