Changeset 91788fa for src/tests/io2.c

Timestamp:

Jul 25, 2018, 6:23:58 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

a95c117, f0b3f51

Parents:

40a7d9c (diff), e89f4b1 (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 plg2:software/cfa/cfa-cc

File:

• src/tests/io2.c (modified) (3 diffs)

src/tests/io2.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.
-// 
-// io2.c -- 
-// 
+//
+// io2.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Mar  2 16:56:02 2016
@@ -12 +12 @@
 // Last Modified On : Thu May 24 21:17:41 2018
 // Update Count     : 103
-// 
+//
 
 #include <fstream>
+
+ #define xstr(s) str(s)
+#define str(s) #s
 
 int main() {
@@ -38 +41 @@
         char s1[size], s2[size];
 
-        ifstream in = { "io.data" };                                            // create / open file
+        ifstream in = { xstr(IN_DIR) "io.data" };                                               // create / open file
 
         sout | "input bacis types" | endl;