From e60d8c23d30a0dfe66b8426f7f2ecf576e812028 Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Tue, 9 Oct 2012 12:05:32 -0700
Subject: [PATCH] rename threads.h -> threads-model.h

There's a name conflict with the C11 <threads.h>
We might as well just avoid the conflict entirely
---
 action.cc                    | 2 +-
 clockvector.cc               | 2 +-
 cmodelint.cc                 | 2 +-
 datarace.cc                  | 2 +-
 impatomic.cc                 | 2 +-
 librace.cc                   | 2 +-
 libthreads.cc                | 2 +-
 main.cc                      | 2 +-
 model.cc                     | 2 +-
 mutex.cc                     | 2 +-
 nodestack.cc                 | 2 +-
 promise.h                    | 2 +-
 schedule.cc                  | 2 +-
 threads.h => threads-model.h | 8 ++++----
 threads.cc                   | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)
 rename threads.h => threads-model.h (97%)

diff --git a/action.cc b/action.cc
index 3aeb737..5e05081 100644
--- a/action.cc
+++ b/action.cc
@@ -7,7 +7,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 #include "nodestack.h"
 
 #define ACTION_INITIAL_CLOCK 0
diff --git a/clockvector.cc b/clockvector.cc
index 2b6a4cc..062ac41 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -6,7 +6,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
diff --git a/cmodelint.cc b/cmodelint.cc
index 6b20c2c..7e52d10 100644
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -1,6 +1,6 @@
 #include "model.h"
 #include "cmodelint.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /** Performs a read action.*/
 uint64_t model_read_action(void * obj, memory_order ord) {
diff --git a/datarace.cc b/datarace.cc
index 7fe5350..270e523 100644
--- a/datarace.cc
+++ b/datarace.cc
@@ -1,6 +1,6 @@
 #include "datarace.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 #include <stdio.h>
 #include <cstring>
 #include "mymemory.h"
diff --git a/impatomic.cc b/impatomic.cc
index 0a35b4b..65b42fe 100644
--- a/impatomic.cc
+++ b/impatomic.cc
@@ -1,7 +1,7 @@
 #include "impatomic.h"
 #include "common.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 
 namespace std {
 
diff --git a/librace.cc b/librace.cc
index bdd6093..3c56d96 100644
--- a/librace.cc
+++ b/librace.cc
@@ -5,7 +5,7 @@
 #include "common.h"
 #include "datarace.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 
 void store_8(void *addr, uint8_t val)
 {
diff --git a/libthreads.cc b/libthreads.cc
index f973176..9e34141 100644
--- a/libthreads.cc
+++ b/libthreads.cc
@@ -1,6 +1,6 @@
 #include "libthreads.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /* global "model" object */
 #include "model.h"
diff --git a/main.cc b/main.cc
index 2a4119a..bff111f 100644
--- a/main.cc
+++ b/main.cc
@@ -6,7 +6,7 @@
 
 #include "libthreads.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 #include "datarace.h"
 
diff --git a/model.cc b/model.cc
index ee3ce99..5753c5c 100644
--- a/model.cc
+++ b/model.cc
@@ -12,7 +12,7 @@
 #include "promise.h"
 #include "datarace.h"
 #include "mutex.h"
-#include "threads.h"
+#include "threads-model.h"
 
 #define INITIAL_THREAD_ID	0
 
diff --git a/mutex.cc b/mutex.cc
index 6ef297a..ce74735 100644
--- a/mutex.cc
+++ b/mutex.cc
@@ -1,6 +1,6 @@
 #include "mutex.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 #include "clockvector.h"
 
 namespace std {
diff --git a/nodestack.cc b/nodestack.cc
index 3db80e8..167d694 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -4,7 +4,7 @@
 #include "action.h"
 #include "common.h"
 #include "model.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /**
  * @brief Node constructor
diff --git a/promise.h b/promise.h
index 2ce3e29..ce84ede 100644
--- a/promise.h
+++ b/promise.h
@@ -8,7 +8,7 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads.h"
+#include "threads-model.h"
 
 #include "model.h"
 
diff --git a/schedule.cc b/schedule.cc
index ec49a74..da6d469 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "threads.h"
+#include "threads-model.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
diff --git a/threads.h b/threads-model.h
similarity index 97%
rename from threads.h
rename to threads-model.h
index 91db236..28d237d 100644
--- a/threads.h
+++ b/threads-model.h
@@ -1,9 +1,9 @@
-/** @file threads.h
+/** @file threads-model.h
  *  @brief Model Checker Thread class.
  */
 
-#ifndef __THREADS_H__
-#define __THREADS_H__
+#ifndef __THREADS_MODEL_H__
+#define __THREADS_MODEL_H__
 
 #include <ucontext.h>
 #include <stdint.h>
@@ -161,4 +161,4 @@ static inline int id_to_int(thread_id_t id)
 	return id;
 }
 
-#endif /* __THREADS_H__ */
+#endif /* __THREADS_MODEL_H__ */
diff --git a/threads.cc b/threads.cc
index 7f51515..2ff058f 100644
--- a/threads.cc
+++ b/threads.cc
@@ -6,7 +6,7 @@
 
 #include "libthreads.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /* global "model" object */
 #include "model.h"
-- 
2.34.1