From b1da5bd2fa7a717a7055139937ed7d31d3d29b56 Mon Sep 17 00:00:00 2001
From: Vincent Hardion <vincent.hardion@synchrotron-soleil.fr>
Date: Wed, 10 Mar 2010 16:26:08 +0000
Subject: [PATCH] fix Tango7 migration
---
pom.xml | 2 +-
src/ADLinkContinuousAO.h | 2 +-
src/ContinuousAO.h | 13 ++++++++-----
src/main.cpp | 11 +++++++----
4 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b891cc..c4ad601 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>ContinuousAO-${aol}-${mode}</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>nar</packaging>
<name>ContinuousAO</name>
<description>ContinuousAO device</description>
diff --git a/src/ADLinkContinuousAO.h b/src/ADLinkContinuousAO.h
index 64e228e..65c1bcf 100644
--- a/src/ADLinkContinuousAO.h
+++ b/src/ADLinkContinuousAO.h
@@ -3,8 +3,8 @@
//============================================================
//DEPENDENCIES
//============================================================
-#include <asl/ContinuousAO.h>
#include <tango.h>
+#include <asl/ContinuousAO.h>
class ADLinkContinuousAO: public asl::ContinuousAO, public Tango::LogAdapter
{
diff --git a/src/ContinuousAO.h b/src/ContinuousAO.h
index 80cce63..d5bf559 100644
--- a/src/ContinuousAO.h
+++ b/src/ContinuousAO.h
@@ -6,11 +6,14 @@
//
// project : Continuous Anolog Output
//
-// $Author: abeilleg $
+// $Author: vince_soleil $
//
-// $Revision: 1.3 $
+// $Revision: 1.4 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.3 2005/06/15 10:22:17 abeilleg
+// added attributes channelXEnable.
+//
// Revision 1.2 2005/01/20 13:21:51 abeilleg
// following ASL modifications (states management).
//
@@ -33,15 +36,15 @@
#ifndef _CONTINUOUSAO_H
#define _CONTINUOUSAO_H
-#include <ADLinkContinuousAO.h>
#include <tango.h>
+#include <ADLinkContinuousAO.h>
//using namespace Tango;
/**
- * @author $Author: abeilleg $
- * @version $Revision: 1.3 $ $
+ * @author $Author: vince_soleil $
+ * @version $Revision: 1.4 $ $
*/
// Add your own constants definitions here.
diff --git a/src/main.cpp b/src/main.cpp
index 9876982..200bbca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,4 +1,4 @@
-static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/ContinuousAO/src/main.cpp,v 1.2 2005-02-09 08:47:43 abeilleg Exp $";
+static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/ContinuousAO/src/main.cpp,v 1.3 2010-03-10 16:25:54 vince_soleil Exp $";
//+=============================================================================
//
// file : main.cpp
@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
//
// project : TANGO Device Server
//
-// $Author: abeilleg $
+// $Author: vince_soleil $
//
-// $Revision: 1.2 $ $
+// $Revision: 1.3 $ $
//
// $Log: not supported by cvs2svn $
+// Revision 1.2 2005/02/09 08:47:43 abeilleg
+// changes to compil with gcc.
+//
// Revision 1.1.1.1 2004/12/06 10:20:44 syldup
// initial import
//
@@ -30,8 +33,8 @@ 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[])
--
GitLab