Merge remote-tracking branch 'origin/3.7' into swift

2 files changed, 9 insertions, 1 deletions

diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index f5033d1fc9f..fa7f50c9b9c 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.h
@@ -42,7 +42,7 @@ public:
     virtual void ice_preMarshal();
 
     /**
-     * The Ice run time invokes this method vafter unmarshaling an object's data members. This allows a
+     * The Ice run time invokes this method after unmarshaling an object's data members. This allows a
      * subclass to override this method in order to perform additional initialization.
      */
     virtual void ice_postUnmarshal();
diff --git a/cpp/include/IceUtil/Optional.h b/cpp/include/IceUtil/Optional.h
index a4266aeeb6c..fdb89b7362b 100644
--- a/cpp/include/IceUtil/Optional.h
+++ b/cpp/include/IceUtil/Optional.h
@@ -47,6 +47,14 @@ public:
     }
 
     /**
+     * Constructs an optional as a copy of the given optional.
+     * @param r The source optional.
+     */
+    Optional(const Optional& r) : _value(r._value), _isSet(r._isSet)
+    {
+    }
+
+    /**
      * Constructs an optional with the given value.
      * @param p The initial value.
      */