summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-06-01 08:59:29 -0700
committerKhem Raj <raj.khem@gmail.com>2021-06-01 09:00:39 -0700
commitbbef20780c0e9c6d525315b930bae4e4be1d3cc9 (patch)
tree3c1915fbc72159b3eb5d5fddca69bf94c27f2945
parente17fc085c025550be08353319983f9b89b11831b (diff)
downloadmeta-openembedded-bbef20780c0e9c6d525315b930bae4e4be1d3cc9.tar.gz
mongodb: Fix -Wc++11-narrowing warning on 32bit
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch35
-rw-r--r--meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch
new file mode 100644
index 0000000000..5b724ff8aa
--- /dev/null
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-Use-explicit-typecast-to-size_t.patch
@@ -0,0 +1,35 @@
1From 6fdb2d304e05a17e57b2efd7f8252794a8722dbe Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 1 Jun 2021 08:25:36 -0700
4Subject: [PATCH] Use explicit typecast to size_t
5
6maxMemoryUsageBytes is size_t type which may not match long long value
7internalDocumentSourceGroupMaxMemoryBytes.load() returns, so typecast it
8to avoid narrowing warning from clang
9
10document_source_group.cpp:378:22: error: non-constant-expression cannot be narrowed from type 'long long' to 'size_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]
11 maxMemoryUsageBytes ? *maxMemoryUsageBytes
12 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13
14Upstream-Status: Submitted [https://github.com/mongodb/mongo/pull/1405]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/mongo/db/pipeline/document_source_group.cpp | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp
21index c7bf44e72e..a52906a940 100644
22--- a/src/mongo/db/pipeline/document_source_group.cpp
23+++ b/src/mongo/db/pipeline/document_source_group.cpp
24@@ -376,7 +376,7 @@ DocumentSourceGroup::DocumentSourceGroup(const intrusive_ptr<ExpressionContext>&
25 _doingMerge(false),
26 _memoryTracker{pExpCtx->allowDiskUse && !pExpCtx->inMongos,
27 maxMemoryUsageBytes ? *maxMemoryUsageBytes
28- : internalDocumentSourceGroupMaxMemoryBytes.load()},
29+ : (size_t)internalDocumentSourceGroupMaxMemoryBytes.load()},
30 _initialized(false),
31 _groups(pExpCtx->getValueComparator().makeUnorderedValueMap<Accumulators>()),
32 _spilled(false) {
33--
342.31.1
35
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
index ba6d052e43..95e0cf7a88 100644
--- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
+++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb
@@ -30,6 +30,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \
30 file://disable_runtime_check.patch \ 30 file://disable_runtime_check.patch \
31 file://ppc64_ARCH_BITS.patch \ 31 file://ppc64_ARCH_BITS.patch \
32 file://0001-Do-not-use-MINSIGSTKSZ.patch \ 32 file://0001-Do-not-use-MINSIGSTKSZ.patch \
33 file://0001-Use-explicit-typecast-to-size_t.patch \
33 " 34 "
34SRC_URI_append_libc-musl ="\ 35SRC_URI_append_libc-musl ="\
35 file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ 36 file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \