diff options
| author | Andrew Morrow <acm@mongodb.com> | 2020-05-26 17:21:56 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-05-28 17:23:42 +0000 |
| commit | fa375b0b13a392f64f44fc48df9b152f3fbcc88b (patch) | |
| tree | e5312149ad1e37fe08dbb627f166df8cdca66de6 /src/third_party | |
| parent | f325c9fec89831c6c4f620c1a97c342bbf269a53 (diff) | |
| download | mongo-fa375b0b13a392f64f44fc48df9b152f3fbcc88b.tar.gz | |
SERVER-48372 Fix new diagnostic in mozjs with VS 2019
Diffstat (limited to 'src/third_party')
| -rwxr-xr-x | src/third_party/mozjs-60/extract.sh | 1 | ||||
| -rw-r--r-- | src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h | 2 | ||||
| -rw-r--r-- | src/third_party/mozjs-60/patches/struct-hasher.patch | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/third_party/mozjs-60/extract.sh b/src/third_party/mozjs-60/extract.sh index 348a8182aa7..4ae30ee6a78 100755 --- a/src/third_party/mozjs-60/extract.sh +++ b/src/third_party/mozjs-60/extract.sh @@ -219,3 +219,4 @@ __XARGS_RM__ patch -p4 < patches/big-endian-fixes.patch patch -p4 < patches/windows-Time.cpp-GetModuleHandle.patch patch -p4 < patches/JSGCConfig.patch +patch -p4 < patches/struct-hasher.patch diff --git a/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h b/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h index 303a438cb70..7db019a2647 100644 --- a/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h +++ b/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h @@ -341,7 +341,7 @@ class StoreBuffer explicit operator bool() const { return objectAndKind_ != 0; } - typedef struct { + typedef struct Hasher { typedef SlotsEdge Lookup; static HashNumber hash(const Lookup& l) { return mozilla::HashGeneric(l.objectAndKind_, l.start_, l.count_); diff --git a/src/third_party/mozjs-60/patches/struct-hasher.patch b/src/third_party/mozjs-60/patches/struct-hasher.patch new file mode 100644 index 00000000000..8772c298553 --- /dev/null +++ b/src/third_party/mozjs-60/patches/struct-hasher.patch @@ -0,0 +1,14 @@ +# Adapted from https://phabricator.services.mozilla.com/D63781 +diff --git a/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h b/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h +index 303a438cb70..7db019a2647 100644 +--- a/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h ++++ b/src/third_party/mozjs-60/extract/js/src/gc/StoreBuffer.h +@@ -341,7 +341,7 @@ class StoreBuffer + + explicit operator bool() const { return objectAndKind_ != 0; } + +- typedef struct { ++ typedef struct Hasher { + typedef SlotsEdge Lookup; + static HashNumber hash(const Lookup& l) { + return mozilla::HashGeneric(l.objectAndKind_, l.start_, l.count_); |