From: Brian Norris <banorris@uci.edu>
Date: Thu, 11 Apr 2013 18:25:16 +0000 (-0700)
Subject: action: refactor, move VALUE_TRY{SUCCESS,FAILED} out of header
X-Git-Tag: oopsla2013~89
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=commitdiff_plain;h=f5305a99cba598d0de55358df103439831dd1eb2

action: refactor, move VALUE_TRY{SUCCESS,FAILED} out of header
---

diff --git a/action.cc b/action.cc
index 6e765fd..08cacd8 100644
--- a/action.cc
+++ b/action.cc
@@ -11,6 +11,12 @@
 
 #define ACTION_INITIAL_CLOCK 0
 
+/** A special value to represent a successful trylock */
+#define VALUE_TRYSUCCESS 1
+
+/** A special value to represent a failed trylock */
+#define VALUE_TRYFAILED 0
+
 /**
  * @brief Construct a new ModelAction
  *
@@ -380,11 +386,9 @@ void ModelAction::create_cv(const ModelAction *parent)
 		cv = new ClockVector(NULL, this);
 }
 
-void ModelAction::set_try_lock(bool obtainedlock) {
-	if (obtainedlock)
-		value = VALUE_TRYSUCCESS;
-	else
-		value = VALUE_TRYFAILED;
+void ModelAction::set_try_lock(bool obtainedlock)
+{
+	value = obtainedlock ? VALUE_TRYSUCCESS : VALUE_TRYFAILED;
 }
 
 /**
diff --git a/action.h b/action.h
index abf5531..46e8273 100644
--- a/action.h
+++ b/action.h
@@ -31,12 +31,6 @@ using std::memory_order_seq_cst;
  *  hence by iteself does not indicate no value. */
 #define VALUE_NONE 0xdeadbeef
 
-/** A special value to represent a successful trylock */
-#define VALUE_TRYSUCCESS 1
-
-/** A special value to represent a failed trylock */
-#define VALUE_TRYFAILED 0
-
 /** @brief Represents an action type, identifying one of several types of
  * ModelAction */
 typedef enum action_type {