Changeset a4943d8c for src/libcfa/containers/result

Timestamp:

May 25, 2017, 12:55:12 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

58daf53, 84d58c5, cc38669

Parents:

bc37a83 (diff), e883a4b (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' of plg2:software/cfa/cfa-cc

File:

• src/libcfa/containers/result (modified) (3 diffs)

src/libcfa/containers/result

@@ -18 +18 @@
 #define RESULT_H
 
+#include <stdbool.h>
 
 // DO NOT USE DIRECTLY!
 forall(otype T, otype E)
+union inner_result{
+        T value;
+        E error;
+};
+
+forall(otype T, otype E)
 struct result {
-        _Bool has_value;
-        union {
-                T value;
-                E error;
-        };
+        bool has_value;
+        inner_result(T, E);
 };
 
@@ -46 +50 @@
 
 forall(otype T, otype E)
-_Bool ?!=?(result(T, E) this, zero_t);
+bool ?!=?(result(T, E) this, zero_t);
 
 forall(otype T, otype E)
@@ -55 +59 @@
 
 forall(otype T, otype E)
-_Bool has_value(result(T, E) * this);
+bool has_value(result(T, E) * this);
 
 forall(otype T, otype E)