Changeset f80e0218 for src/tests/vector/vector_int.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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 gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/tests/vector/vector_int.h (moved) (moved from src/examples/vector_int.h ) (3 diffs)

src/tests/vector/vector_int.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// vector_int.h -- 
+// vector_int.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Wed May 27 17:56:53 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 27 18:39:05 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 27 17:26:59 2016
 // Update Count     : 2
 //
@@ -25 +25 @@
 } vector_int;
 
-vector_int vector_int_allocate();                                               // allocate vector with default capacity
-vector_int vector_int_allocate( int reserve );                  // allocate vector with specified capacity
-void vector_int_deallocate( vector_int );                               // deallocate vector's storage
+void ?{}( vector_int * );                                                               // allocate vector with default capacity
+void ?{}( vector_int *, int reserve );          // allocate vector with specified capacity
+void ?{}( vector_int * vec, vector_int other ); // copy constructor
+void ^?{}( vector_int * );                                                              // deallocate vector's storage
 
 void reserve( vector_int *vec, int reserve );                   // reserve more capacity
@@ -34 +35 @@
 // implement bounded_array
 
-lvalue int ?[?]( vector_int vec, int index );                   // access to arbitrary element (does not resize)
-int last( vector_int vec );                                                             // return last element
+lvalue int ?[?]( vector_int * vec, int index );                 // access to arbitrary element (does not resize)
+int last( vector_int * vec );                                                           // return last element
 
 #endif // VECTOR_INT_H