Skip to content
Snippets Groups Projects
Commit b1da5bd2 authored by Vincent Hardion's avatar Vincent Hardion
Browse files

fix Tango7 migration

parent e9bcda90
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>fr.soleil.device</groupId> <groupId>fr.soleil.device</groupId>
<artifactId>ContinuousAO-${aol}-${mode}</artifactId> <artifactId>ContinuousAO-${aol}-${mode}</artifactId>
<version>1.0.0</version> <version>1.0.1-SNAPSHOT</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>ContinuousAO</name> <name>ContinuousAO</name>
<description>ContinuousAO device</description> <description>ContinuousAO device</description>
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
//============================================================ //============================================================
//DEPENDENCIES //DEPENDENCIES
//============================================================ //============================================================
#include <asl/ContinuousAO.h>
#include <tango.h> #include <tango.h>
#include <asl/ContinuousAO.h>
class ADLinkContinuousAO: public asl::ContinuousAO, public Tango::LogAdapter class ADLinkContinuousAO: public asl::ContinuousAO, public Tango::LogAdapter
{ {
......
...@@ -6,11 +6,14 @@ ...@@ -6,11 +6,14 @@
// //
// project : Continuous Anolog Output // project : Continuous Anolog Output
// //
// $Author: abeilleg $ // $Author: vince_soleil $
// //
// $Revision: 1.3 $ // $Revision: 1.4 $
// //
// $Log: not supported by cvs2svn $ // $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 // Revision 1.2 2005/01/20 13:21:51 abeilleg
// following ASL modifications (states management). // following ASL modifications (states management).
// //
...@@ -33,15 +36,15 @@ ...@@ -33,15 +36,15 @@
#ifndef _CONTINUOUSAO_H #ifndef _CONTINUOUSAO_H
#define _CONTINUOUSAO_H #define _CONTINUOUSAO_H
#include <ADLinkContinuousAO.h>
#include <tango.h> #include <tango.h>
#include <ADLinkContinuousAO.h>
//using namespace Tango; //using namespace Tango;
/** /**
* @author $Author: abeilleg $ * @author $Author: vince_soleil $
* @version $Revision: 1.3 $ $ * @version $Revision: 1.4 $ $
*/ */
// Add your own constants definitions here. // Add your own constants definitions here.
......
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 // file : main.cpp
...@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD ...@@ -10,11 +10,14 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
// //
// project : TANGO Device Server // project : TANGO Device Server
// //
// $Author: abeilleg $ // $Author: vince_soleil $
// //
// $Revision: 1.2 $ $ // $Revision: 1.3 $ $
// //
// $Log: not supported by cvs2svn $ // $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 // Revision 1.1.1.1 2004/12/06 10:20:44 syldup
// initial import // initial import
// //
...@@ -30,8 +33,8 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD ...@@ -30,8 +33,8 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD
// //
// (c) - Software Engineering Group - ESRF // (c) - Software Engineering Group - ESRF
//============================================================================= //=============================================================================
#include <ace/ACE.h>
#include <tango.h> #include <tango.h>
#include <ace/ACE.h>
int main(int argc,char *argv[]) int main(int argc,char *argv[])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment