Changeset 981bdc6 for src/libcfa/containers/vector

Timestamp:

Jan 12, 2017, 2:05:49 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:

f3b0a07

Parents:

2298a7b8 (diff), 3fe34ae (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/libcfa/containers/vector (modified) (2 diffs)

src/libcfa/containers/vector

@@ -13 +13 @@
 // Update Count     : 2
 //
-
-#ifdef __CFORALL__
 
 #ifndef VECTOR_H
@@ -170 +168 @@
 #endif // VECTOR_H
 
-#else
-#include_next <vector>
-#endif //__CFORALL__
-
 // Local Variables: //
 // mode: c //