From 60c59c2ebab1aee6fef0fa1f9e1c3ea2aefb519a Mon Sep 17 00:00:00 2001 From: Vincent Hardion <vincent.hardion@synchrotron-soleil.fr> Date: Thu, 25 Mar 2010 18:46:57 +0000 Subject: [PATCH] "Migration_Tango7" --- pom.xml | 2 +- src/RetrigAO.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 4b3f47c..7203bb4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ <groupId>fr.soleil.device</groupId> <artifactId>RetrigAO-${aol}-${mode}</artifactId> - <version>1.0.6</version> + <version>1.0.7</version> <packaging>nar</packaging> <name>RetrigAO</name> diff --git a/src/RetrigAO.h b/src/RetrigAO.h index b12f15d..15e97bb 100644 --- a/src/RetrigAO.h +++ b/src/RetrigAO.h @@ -6,11 +6,14 @@ // // project : Retriggered Continuous Anolog Output // -// $Author: anoureddine $ +// $Author: vince_soleil $ // -// $Revision: 1.10 $ +// $Revision: 1.11 $ // // $Log: not supported by cvs2svn $ +// Revision 1.10 2010/03/11 11:10:25 anoureddine +// deplace #include <tango.h> due to conflict between tang7/ACE +// // 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 @@ -63,8 +66,8 @@ //using namespace Tango; //class ADLinkContinuousAO; /** - * @author $Author: anoureddine $ - * @version $Revision: 1.10 $ $ + * @author $Author: vince_soleil $ + * @version $Revision: 1.11 $ $ */ // Add your own constants definitions here. @@ -88,7 +91,7 @@ namespace RetrigAO_ns */ -class RetrigAO: public Tango::Device_3Impl +class RetrigAO: public Tango::Device_4Impl { public : // Add your own data members here -- GitLab