redo model object initialization

[c11tester.git] / include / cmodelint.h

diff --git a/include/cmodelint.h b/include/cmodelint.h
index d6cd8f9bd8b104206f2efb3b976b270e28c3d713..7bc6a253c9b5fedd61b7574558c647399f0207a3 100644 (file)
--- a/include/cmodelint.h
+++ b/include/cmodelint.h
@@ -10,8 +10,11 @@
 #if __cplusplus
 using std::memory_order;
 extern "C" {
+#else
+typedef int bool;
 #endif
 
+  
 uint64_t model_read_action(void * obj, memory_order ord);
 void model_write_action(void * obj, memory_order ord, uint64_t val);
 void model_init_action(void * obj, uint64_t val);
@@ -22,7 +25,7 @@ void model_rmwc_action(void *obj, memory_order ord);
 void model_fence_action(memory_order ord);
 
 uint64_t model_rmwr_action_helper(void *obj, int atomic_index, const char *position);
-uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, const char *position);
+  uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oval, int size, const char *position);
 void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index, const char *position);
 void model_rmwc_action_helper(void *obj, int atomic_index, const char *position);
 // void model_fence_action_helper(int atomic_index);