Changeset 455a7d5 for libcfa/src/containers/pair.cfa

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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 jenkins-sandbox

File:

• libcfa/src/containers/pair.cfa (moved) (moved from src/libcfa/containers/pair.c ) (4 diffs)

libcfa/src/containers/pair.cfa

@@ -11 +11 @@
 //
 
-#include <containers/pair>
+#include <containers/pair.hfa>
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?<?(R, R); int ?<?(S, S); })
 int ?<?(pair(R, S) p, pair(R, S) q) {
@@ -19 +19 @@
 }
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?<?(R, R); int ?<=?(S, S); })
 int ?<=?(pair(R, S) p, pair(R, S) q) {
@@ -35 +35 @@
 }
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?>?(R, R); int ?>?(S, S); })
 int ?>?(pair(R, S) p, pair(R, S) q) {
@@ -41 +41 @@
 }
 
-forall(otype R, otype S 
+forall(otype R, otype S
         | { int ?==?(R, R); int ?>?(R, R); int ?>=?(S, S); })
 int ?>=?(pair(R, S) p, pair(R, S) q) {