Merge pull request #33 from mapbox/fix_assignment_operator

fix assignment of optionals, adds a unit test
mapbox · Oct 22, 2014 · c56af22 · c56af22
2 parents eb99515 + f69f317
commit c56af22
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/optional.hpp b/optional.hpp
@@ -33,15 +33,6 @@ template <typename T> class optional
 
     optional(T const &v) { variant_ = v; }
 
-    optional &operator=(optional other)
-    { // note: argument passed by value!
-        if (this != &other)
-        {
-            swap(other);
-        }
-        return *this;
-    }
-
     explicit operator bool() const noexcept { return variant_.template is<T>(); }
 
     T const &get() const { return variant_.template get<T>(); }

diff --git a/test/optional_unit.cpp b/test/optional_unit.cpp
@@ -67,5 +67,16 @@ TEST_CASE( "emplace initialization, reset", "[optional]" ) {
 
     dummy_opt.reset();
     REQUIRE(!dummy_opt);
+}
+
+TEST_CASE( "assignment", "[optional]") {
+    mapbox::util::optional<int> a;
+    mapbox::util::optional<int> b;
 
+    a = 1; b = 3;
+    REQUIRE(a.get() == 1);
+    REQUIRE(b.get() == 3);
+    b = a;
+    REQUIRE(a.get() == b.get());
+    REQUIRE(b.get() == 1);
 }