Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 5 insertions, 8 deletions

diff --git a/src/mongo/db/exec/document_value/value.h b/src/mongo/db/exec/document_value/value.h
index 62a31f25727..bf54221326c 100644
--- a/src/mongo/db/exec/document_value/value.h
+++ b/src/mongo/db/exec/document_value/value.h
@@ -344,9 +344,9 @@ public:
     friend std::ostream& operator<<(std::ostream& out, const Value& v);
 
     /**
-     * Returns a cache-only copy of the value with no backing bson.
+     * Populates the internal cache by recursively walking the underlying BSON.
      */
-    Value shred() const;
+    void fillCache() const;
 
     void swap(Value& rhs) {
         _storage.swap(rhs._storage);
@@ -430,16 +430,13 @@ public:
     ImplicitValue(T&& arg) : Value(std::forward<T>(arg)) {}
 
     ImplicitValue(std::initializer_list<ImplicitValue> values) : Value(convertToValues(values)) {}
-    ImplicitValue(std::vector<ImplicitValue> values) : Value(convertToValues(values)) {}
 
-    template <typename T>
-    ImplicitValue(std::vector<T> values) : Value(convertToValues(values)) {}
+    ImplicitValue(std::vector<int> values) : Value(convertToValues(values)) {}
 
-    template <typename T>
-    static std::vector<Value> convertToValues(const std::vector<T>& vec) {
+    static std::vector<Value> convertToValues(const std::vector<int>& vec) {
         std::vector<Value> values;
         values.reserve(vec.size());
-        for_each(vec.begin(), vec.end(), ([&](const T& val) { values.emplace_back(val); }));
+        for_each(vec.begin(), vec.end(), ([&](const int& val) { values.emplace_back(val); }));
         return values;
     }