Changeset 90152a4 for tests/raii

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

Location:

tests/raii

Files:

• .expect/ctor-autogen-ERR1.txt (added)
• .expect/ctor-autogen.txt (added)
• .expect/dtor-early-exit-ERR1.txt (added)
• .expect/dtor-early-exit-ERR2.txt (added)
• .expect/dtor-early-exit.txt (moved) (moved from src/tests/.expect/dtor-early-exit.txt )
• .expect/globals.txt (moved) (moved from src/tests/.expect/globals.txt )
• .expect/init_once.txt (added)
• .expect/memberCtors-ERR1.txt (added)
• .expect/memberCtors.txt (moved) (moved from src/tests/.expect/memberCtors.txt )
• ctor-autogen.c (moved) (moved from src/tests/ctor-autogen.c )
• dtor-early-exit.c (moved) (moved from src/tests/dtor-early-exit.c ) (1 diff)
• globals.c (moved) (moved from src/tests/globals.c ) (1 diff)
• init_once.c (moved) (moved from src/tests/init_once.c )
• memberCtors.c (moved) (moved from src/tests/memberCtors.c )
• multiDimension.c (moved) (moved from src/tests/multiDimension.c )
• multiDimension.txt (moved) (moved from src/tests/.expect/multiDimension.txt )

tests/raii/dtor-early-exit.c

@@ -10 +10 @@
 // Created On       : Wed Aug 17 08:26:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 17 08:29:37 2016
-// Update Count     : 2
-//
-
-#include <fstream>
-#include <stdlib>
-extern "C" {
-#define false ((int)0)  // until stdbool.h works
-#define assert(cond) if (! (cond)) { sout | "Assertion failed: (" | #cond | ") at " __FILE__ | ":" | __LINE__ | endl; abort(); }
-}
+// Last Modified On : Sat Aug 11 07:58:39 2018
+// Update Count     : 8
+//
+
+#include <fstream.hfa>
+#include <stdlib.hfa>
+#include <assert.h>
 
 struct A {

tests/raii/globals.c

@@ -1 @@
-#include <fstream>
+#include <fstream.hfa>
 
 struct value_t {