traceanalysis: rename to remove '_'

diff --git a/model.cc b/model.cc
index 826497945556055254e7ef8a0a32507fc7bc4716..a7558c8c3a67dba4636264dd038d0204d37009c7 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -80,7 +80,7 @@ ModelChecker::ModelChecker(struct model_params params) :
        thrd_last_action(new SnapVector<ModelAction *>(1)),
        thrd_last_fence_release(new SnapVector<ModelAction *>()),
        node_stack(new NodeStack()),
-       trace_analyses(new ModelVector<Trace_Analysis *>()),
+       trace_analyses(new ModelVector<TraceAnalysis *>()),
        priv(new struct model_snapshot_members()),
        mo_graph(new CycleGraph())
 {

diff --git a/model.h b/model.h
index ff4b2c1800a0a2faece1d4d19de23e9176b684da..d5b0e76196b4fac41150d6638fc838ba8b38eeb9 100644 (file)
--- a/model.h
+++ b/model.h
@@ -25,7 +25,7 @@ class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
-class Trace_Analysis;
+class TraceAnalysis;
 struct model_snapshot_members;
 
 /** @brief Shorthand for a list of release sequence heads */
@@ -106,7 +106,7 @@ public:
 
        const model_params params;
        Node * get_curr_node() const;
-       void add_trace_analysis(Trace_Analysis * a) {
+       void add_trace_analysis(TraceAnalysis *a) {
                trace_analyses->push_back(a);
        }
 
@@ -220,7 +220,7 @@ private:
        SnapVector<ModelAction *> * const thrd_last_action;
        SnapVector<ModelAction *> * const thrd_last_fence_release;
        NodeStack * const node_stack;
-       ModelVector<Trace_Analysis *> * trace_analyses;
+       ModelVector<TraceAnalysis *> * trace_analyses;
 
 
        /** Private data members that should be snapshotted. They are grouped

diff --git a/scanalysis.h b/scanalysis.h
index f9db2db74693d4e4706dc08a2462d1e842f2bb3d..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();

diff --git a/traceanalysis.h b/traceanalysis.h
index a0b1b5cf920d77747b99227c5d076766c3601c7b..8376bbcf10c1fa433f18ff8bb8501727e649a15f 100644 (file)
--- a/traceanalysis.h
+++ b/traceanalysis.h
@@ -2,7 +2,7 @@
 #define TRACE_ANALYSIS_H
 #include "model.h"
 
-class Trace_Analysis {
+class TraceAnalysis {
  public:
        virtual void analyze(action_list_t *) = 0;
        SNAPSHOTALLOC