Bug 1325351 part 1 - Remove workaround for VS2010 in Maybe. r=froydnj
☠☠ backed out by 38fe624589d3 ☠ ☠
authorXidorn Quan <me@upsuper.org>
Fri, 23 Dec 2016 11:32:09 +1100
changeset 372336 b4d189ca8add5a3b5fd27d8e3b7d42c812a195d0
parent 372335 9947679164c83317365fb5401d9043cd043d0666
child 372337 79754b9b89b744325ea773c83185a4520bdbd632
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1325351
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1325351 part 1 - Remove workaround for VS2010 in Maybe. r=froydnj MozReview-Commit-ID: Anlrf3D2WtN
mfbt/Maybe.h
--- a/mfbt/Maybe.h
+++ b/mfbt/Maybe.h
@@ -152,23 +152,17 @@ public:
     }
   }
 
   Maybe& operator=(const Maybe& aOther)
   {
     if (&aOther != this) {
       if (aOther.mIsSome) {
         if (mIsSome) {
-          // XXX(seth): The correct code for this branch, below, can't be used
-          // due to a bug in Visual Studio 2010. See bug 1052940.
-          /*
           ref() = aOther.ref();
-          */
-          reset();
-          emplace(*aOther);
         } else {
           emplace(*aOther);
         }
       } else {
         reset();
       }
     }
     return *this;