Update upstream source from tag 'upstream/6.0.0'master

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

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mongo/db/update/object_replace_executor.h b/src/mongo/db/update/object_replace_executor.h
index 3f4c787e588..f9c70bde919 100644
--- a/src/mongo/db/update/object_replace_executor.h
+++ b/src/mongo/db/update/object_replace_executor.h
@@ -65,11 +65,10 @@ public:
                                               bool allowTopLevelDollarPrefixedFields = false);
 
     /**
-     * Initializes the node with the document to replace with. If 'bypassEmptyTsReplacement' is
-     * false, any zero-valued timestamps (except for the _id) will be replaced with the current
-     * time.
+     * Initializes the node with the document to replace with. Any zero-valued timestamps (except
+     * for the _id) are updated to the current time.
      */
-    explicit ObjectReplaceExecutor(BSONObj replacement, bool bypassEmptyTsReplacement = false);
+    explicit ObjectReplaceExecutor(BSONObj replacement);
 
     /**
      * Replaces the document that 'applyParams.element' belongs to with 'val'. If 'val' does not
@@ -96,8 +95,6 @@ private:
 
     // True if '_replacementDoc' contains an _id.
     bool _containsId;
-
-    bool _bypassEmptyTsReplacement = false;
 };
 
 }  // namespace mongo