deplace #include <tango.h> due to conflict between tang7/ACE

pom.xml

@@ -9,7 +9,7 @@
 
   <groupId>fr.soleil.device</groupId>
   <artifactId>RetrigAO-${aol}-${mode}</artifactId>
-  <version>1.0.5</version>
+  <version>1.0.6</version>
 
   <packaging>nar</packaging>
   <name>RetrigAO</name>

src/ADLinkContinuousAO.h

@@ -3,8 +3,9 @@
 //============================================================
 //DEPENDENCIES
 //============================================================
-#include <asl/ContinuousAO.h>
 #include <Tango.h>
+#include <asl/ContinuousAO.h>
+
 
 class ADLinkContinuousAO: public asl::ContinuousAO, public Tango::LogAdapter
 {
@@ -36,4 +37,4 @@ public:
 private:
 	ACE_Thread_Mutex data_lock_;
 };
-#endif	// _ADLinkContinuousAO_H
\ No newline at end of file
+#endif	// _ADLinkContinuousAO_H

src/RetrigAO.h

@@ -8,9 +8,13 @@
 //
 // $Author: anoureddine $
 //
-// $Revision: 1.9 $
+// $Revision: 1.10 $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.9  2009/09/29 07:56:13  anoureddine
+// - Add BufferDepth property and use it to memorize bufferDepth attribute in order to keep compatibility wilth previous version
+// - call init_board() in stop() command
+//
 // Revision 1.8  2009/09/16 08:10:54  anoureddine
 // - Transform bufferDepth property into attribute.
 // - Generate code with pogo 5.2.10
@@ -52,15 +56,15 @@
 #ifndef _RETRIGAO_H
 #define _RETRIGAO_H
 
-#include <ADLinkContinuousAO.h>
 #include <tango.h>
+#include <ADLinkContinuousAO.h>
 
 
 //using namespace Tango;
 //class ADLinkContinuousAO;
 /**
  * @author	$Author: anoureddine $
- * @version	$Revision: 1.9 $ $
+ * @version	$Revision: 1.10 $ $
  */
 
  //	Add your own constants definitions here.

src/main.cpp

-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/main.cpp,v 1.1.1.1 2004-12-06 10:23:37 syldup Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/RetrigAO/src/main.cpp,v 1.2 2010-03-11 11:10:25 anoureddine Exp $";
 //+=============================================================================
 //
 // file :        main.cpp
@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
 //
 // project :     TANGO Device Server
 //
-// $Author: syldup $
+// $Author: anoureddine $
 //
-// $Revision: 1.1.1.1 $ $
+// $Revision: 1.2 $ $
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.1.1.1  2004/12/06 10:23:37  syldup
+// initial import
+//
 //
 // copyleft :     Synchrotron SOLEIL
 //                L'Orme des Merisiers
@@ -27,8 +30,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
 //
 //         (c) - Software Engineering Group - ESRF
 //=============================================================================
-#include <ace\ACE.h>
 #include <tango.h>
+#include <ace\ACE.h>
+
 
 
 int main(int argc,char *argv[])