model: remove public check_promises() interface

[c11tester.git] / scanalysis.h

diff --git a/scanalysis.h b/scanalysis.h
index 79f78f1c00d630b6a1557015d2c5e4683f231879..06fc2ed54d7cc0b04bd04071a2649895e4a4ef05 100644 (file)
--- a/scanalysis.h
+++ b/scanalysis.h
@@ -3,7 +3,7 @@
 #include "traceanalysis.h"
 #include "hashtable.h"
 
-class SCAnalysis : public Trace_Analysis {
+class SCAnalysis : public TraceAnalysis {
  public:
        SCAnalysis();
        ~SCAnalysis();
@@ -18,8 +18,10 @@ class SCAnalysis : public Trace_Analysis {
        action_list_t * generateSC(action_list_t *);
        bool processRead(ModelAction *read, ClockVector *cv);
        ModelAction * getNextAction();
+       bool merge(ClockVector * cv, const ModelAction * act, ClockVector *cv2);
        int maxthreads;
        HashTable<const ModelAction *,ClockVector *, uintptr_t, 4 > * cvmap;
+       HashTable<const ModelAction *,const ModelAction *, uintptr_t, 4 > * cycleset;
        SnapVector<action_list_t> * threadlists;
 };
 #endif