model: embed the trace_analyses in the class

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 4dbe557222c40a0a7d92fb55227a202d54f069f6..7d84f60112c5ef26b8c54cf9e139f016fc05df7b 100644 (file)
--- a/model.h
+++ b/model.h
@@ -58,20 +58,18 @@ public:
        bool is_enabled(Thread *t) const;
        bool is_enabled(thread_id_t tid) const;
 
-       thread_id_t get_next_id();
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
        void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
-       void check_promises_thread_disabled();
 
        bool assert_bug(const char *msg, ...);
        void assert_user_bug(const char *msg);
 
        const model_params params;
        void add_trace_analysis(TraceAnalysis *a) {
-               trace_analyses->push_back(a);
+               trace_analyses.push_back(a);
        }
 
        action_list_t * get_actions_on_obj(void * obj, thread_id_t tid);
@@ -98,7 +96,7 @@ private:
 
        ucontext_t system_context;
 
-       ModelVector<TraceAnalysis *> * trace_analyses;
+       ModelVector<TraceAnalysis *> trace_analyses;
 
        /** @brief The cumulative execution stats */
        struct execution_stats stats;