Changeset 23b6643f for src/tests

Timestamp:

Sep 20, 2016, 4:47:34 PM (9 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:

1132b62

Parents:

aefcc3b (diff), db46512 (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 tuples

Conflicts:

src/Makefile.in
src/ResolvExpr/Unify.cc
src/SynTree/Type.h

Location:

src/tests

Files:

• .expect/libcfa_vector.txt (added)
• libcfa_vector.c (modified) (3 diffs)

src/tests/libcfa_vector.c

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// libcfa_vector.c -- 
-// 
+//
+// libcfa_vector.c --
+//
 // Author           : Thierry Delisle
 // Created On       : Mon Jul  4 23:36:19 2016
@@ -12 +12 @@
 // Last Modified On : Tue Jul  5 15:08:05 2016
 // Update Count     : 26
-// 
+//
 
 #include <fstream>
@@ -28 +28 @@
 int main() {
         vector( int, heap_allocator(int) ) iv;
-        ctor( &iv );
 
         assert( empty( &iv ) );