From e10e6fb7dfe4c7d5e4edade68e73ee5906bf3d4c Mon Sep 17 00:00:00 2001
From: System User <picca@b1225-srv2.cristal.rcl>
Date: Wed, 15 Apr 2009 10:13:41 +0200
Subject: [PATCH] * move the compose_state into the macro.h file

---
 src/TangoHKLAdapter.cpp | 19 -------------------
 src/macros.h            | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/TangoHKLAdapter.cpp b/src/TangoHKLAdapter.cpp
index bd87508..574d97f 100644
--- a/src/TangoHKLAdapter.cpp
+++ b/src/TangoHKLAdapter.cpp
@@ -1461,25 +1461,6 @@ namespace DiffractometerDevice_ns
 
 }	//	namespace
 
-void compose_state(Tango::DevState & state, Tango::DevState const & axe_state)
-{
-	switch(axe_state) {
-	case Tango::OFF:
-		if (state == Tango::MOVING || state == Tango::STANDBY)
-			state = Tango::OFF;
-		break;
-	case Tango::MOVING:
-		if (state == Tango::STANDBY)
-			state = Tango::MOVING;
-		break;
-	case Tango::FAULT:
-		state = Tango::FAULT;
-		break;
-	default:
-		break;
-	}
-}
-
 std::string hkl_axes_consign_as_string(HklAxis const **axes, size_t axes_len)
 {
 	size_t i;
diff --git a/src/macros.h b/src/macros.h
index e97a20a..1d0ef72 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -1,6 +1,8 @@
 #ifndef _MACROS_H
 #define _MACROS_H
 
+#include <tango.h>
+
 #ifdef _MSC_VER
 # define strtok_r strtok_s
 # define snprintf _snprintf
@@ -62,4 +64,23 @@
 	TANGO_EXCEPTION_RE_THROW_(tango_ex, "TANGO_ERROR");\
 } while(0);
 
+inline void compose_state(Tango::DevState & state, Tango::DevState const & axe_state)
+{
+	switch(axe_state) {
+	case Tango::OFF:
+		if (state == Tango::MOVING || state == Tango::STANDBY)
+			state = Tango::OFF;
+		break;
+	case Tango::MOVING:
+		if (state == Tango::STANDBY)
+			state = Tango::MOVING;
+		break;
+	case Tango::FAULT:
+		state = Tango::FAULT;
+		break;
+	default:
+		break;
+	}
+}
+
 #endif // _MACROS_H
-- 
2.11.4.GIT