Changeset 933f32f for libcfa/src/containers/result.cfa

Timestamp:

May 24, 2019, 10:19:41 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d908563

Parents:

6a9d4b4 (diff), 292642a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into cleanup-dtors

File:

• libcfa/src/containers/result.cfa (modified) (2 diffs)

libcfa/src/containers/result.cfa

@@ -10 +10 @@
 // Created On       : Wed May 24 15:40:00 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 20 15:23:58 2017
-// Update Count     : 2
+// Last Modified On : Sun Feb 17 11:24:04 2019
+// Update Count     : 3
 //
 
@@ -48 +48 @@
 forall(otype T, otype E)
 result(T, E) ?=?(result(T, E) & this, result(T, E) that) {
-        if (this.has_value & that.has_value) {
+        if (this.has_value && that.has_value) {
                 this.value = that.value;
         } else if (this.has_value) {