Changeset d3a85240 for src/libcfa/containers/vector

Timestamp:

Jan 11, 2017, 3:30:10 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:

2162c2c, 2298a7b8

Parents:

dd0c97b (diff), 17e5e2b (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

@@ -14 +14 @@
 //
 
-#pragma once
+#ifdef __CFORALL__
+
+#ifndef VECTOR_H
+#define VECTOR_H
 
 extern "C" {
@@ -165 +168 @@
 }
 
+#endif // VECTOR_H
+
+#else
+#include_next <vector>
+#endif //__CFORALL__
+
 // Local Variables: //
 // mode: c //