Changeset 579263a for src/libcfa/containers/maybe

Timestamp:

Jun 26, 2017, 4:48:35 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

bb1cd95

Parents:

e4d829b (diff), 2a7b3ca (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 designations

Conflicts:

src/InitTweak/FixInit.cc
src/SymTab/Autogen.h
src/SynTree/Initializer.cc
src/SynTree/Initializer.h
src/Tuples/TupleExpansion.cc

File:

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

src/libcfa/containers/maybe

@@ -10 +10 @@
 // Created On       : Wed May 24 14:43:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr May 25 16:36:00 2017
-// Update Count     : 1
+// Last Modified On : Fri Jun 16 15:42:00 2017
+// Update Count     : 2
 //
 
@@ -46 +46 @@
 bool ?!=?(maybe(T) this, zero_t);
 
+/* Waiting for bug#11 to be fixed.
 forall(otype T)
 maybe(T) maybe_value(T value);
@@ -51 +52 @@
 forall(otype T)
 maybe(T) maybe_none();
+*/
 
 forall(otype T)