Skip to content
Snippets Groups Projects
Commit cbb2eb13 authored by Florent LANGLOIS's avatar Florent LANGLOIS
Browse files

- moved tango.h above asl/ace's .h

parent 69d3bc66
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>SingleShotDIO-${aol}-${mode}</artifactId> <artifactId>SingleShotDIO-${aol}-${mode}</artifactId>
<version>1.0.0</version> <version>1.0.1-SNAPSHOT</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>SingleShotDIO</name> <name>SingleShotDIO</name>
<description>SingleShotDIO device</description> <description>SingleShotDIO device</description>
......
...@@ -6,11 +6,14 @@ ...@@ -6,11 +6,14 @@
// //
// project : SingleShotDIOProject // project : SingleShotDIOProject
// //
// $Author: abeilleg $ // $Author: flanglois $
// //
// $Revision: 1.6 $ // $Revision: 1.7 $
// //
// $Log: not supported by cvs2svn $ // $Log: not supported by cvs2svn $
// Revision 1.6 2005/07/01 09:41:07 abeilleg
// delete_device added in dtor
//
// Revision 1.5 2004/09/30 13:23:58 abeilleg // Revision 1.5 2004/09/30 13:23:58 abeilleg
// minor changes. // minor changes.
// //
...@@ -38,10 +41,11 @@ ...@@ -38,10 +41,11 @@
#ifndef _SINGLESHOTDIO_H #ifndef _SINGLESHOTDIO_H
#define _SINGLESHOTDIO_H #define _SINGLESHOTDIO_H
#include <tango.h>
#include <asl\SingleShotDI.h> #include <asl\SingleShotDI.h>
#include <asl\SingleShotDO.h> #include <asl\SingleShotDO.h>
#include <tango.h>
//using namespace Tango; //using namespace Tango;
#include <asl\DAQException.h> #include <asl\DAQException.h>
...@@ -50,8 +54,8 @@ ...@@ -50,8 +54,8 @@
/** /**
* @author $Author: abeilleg $ * @author $Author: flanglois $
* @version $Revision: 1.6 $ $ * @version $Revision: 1.7 $ $
*/ */
// Add your own constants definitions here. // Add your own constants definitions here.
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/SingleShotDIO/src/main.cpp,v 1.1.1.1 2004-07-02 15:24:52 syldup Exp $"; static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/ADLINK/SingleShotDIO/src/main.cpp,v 1.2 2010-03-11 09:51:10 flanglois 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: syldup $ // $Author: flanglois $
// //
// $Revision: 1.1.1.1 $ $ // $Revision: 1.2 $ $
// //
// $Log: not supported by cvs2svn $ // $Log: not supported by cvs2svn $
// Revision 1.1.1.1 2004/07/02 15:24:52 syldup
// initial import
//
// //
// copyleft : European Synchrotron Radiation Facility // copyleft : European Synchrotron Radiation Facility
// BP 220, Grenoble 38043 // BP 220, Grenoble 38043
...@@ -27,8 +30,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/InputOutput/AD ...@@ -27,8 +30,9 @@ 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