Fix printf compile issue

[c11tester.git] / datarace.h

diff --git a/datarace.h b/datarace.h
index 78903d336832bb7439d4a8ab61799dd48f2ceed5..a83116bb311d21fe5b0bc738baf9ebc21b318664 100644 (file)
--- a/datarace.h
+++ b/datarace.h
@@ -2,15 +2,13 @@
  *  @brief Data race detection code.
  */
 
-#ifndef DATARACE_H
+#ifndef __DATARACE_H__
+#define __DATARACE_H__
+
 #include "config.h"
 #include <stdint.h>
 #include "modeltypes.h"
-#include "stl-model.h"
-
-/* Forward declaration */
-class ClockVector;
-class ModelAction;
+#include "classlist.h"
 
 struct ShadowTable {
        void * array[65536];
@@ -22,7 +20,7 @@ struct ShadowBaseTable {
 
 struct DataRace {
        /* Clock and thread associated with first action.  This won't change in
-                response to synchronization. */
+                response to synchronization. */
 
        thread_id_t oldthread;
        modelclock_t oldclock;
@@ -30,7 +28,7 @@ struct DataRace {
        bool isoldwrite;
 
        /* Model action associated with second action.  This could change as
-                a result of synchronization. */
+                a result of synchronization. */
        ModelAction *newaction;
        /* Record whether this is a write, so we can tell the user. */
        bool isnewwrite;
@@ -46,8 +44,7 @@ void raceCheckWrite(thread_id_t thread, void *location);
 void raceCheckRead(thread_id_t thread, const void *location);
 bool checkDataRaces();
 void assert_race(struct DataRace *race);
-
-extern SnapVector<struct DataRace *> unrealizedraces;
+bool haveUnrealizedRaces();
 
 /**
  * @brief A record of information for detecting data races
@@ -91,4 +88,5 @@ struct RaceRecord {
 #define MAXTHREADID (THREADMASK-1)
 #define MAXREADVECTOR (READMASK-1)
 #define MAXWRITEVECTOR (WRITEMASK-1)
-#endif
+
+#endif /* __DATARACE_H__ */