From 5178739a27add5e59a1213c9ac90e73397c1a23d Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Mon, 15 Apr 2013 16:56:51 -0700
Subject: [PATCH] traceanalysis: rename to remove '_'

---
 model.cc        | 2 +-
 model.h         | 6 +++---
 scanalysis.h    | 2 +-
 traceanalysis.h | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/model.cc b/model.cc
index 8264979..a7558c8 100644
--- 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 ff4b2c1..d5b0e76 100644
--- 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 f9db2db..06fc2ed 100644
--- 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 a0b1b5c..8376bbc 100644
--- 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
-- 
2.34.1