diff --git a/pom.xml b/pom.xml index ca746c98de05195e6fc335b10da003e132176286..8ce2c0c7fbc8b6b45e8a098b58dba4b28b38ca65 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ </parent> <groupId>fr.soleil.device</groupId> <artifactId>AcquireWaveformLecroy-${aol}-${mode}</artifactId> - <version>1.1.7</version> + <version>1.1.8</version> <packaging>nar</packaging> <name>AcquireWaveformLecroy</name> <description>AcquireWaveformLecroy device</description> diff --git a/src/AcquireWaveformLecroy.cpp b/src/AcquireWaveformLecroy.cpp index 4f1cc7122020940596675af7d18c04e95a74de63..ea2c299283c6edcc01336605731c49a4ff32c3f5 100644 --- a/src/AcquireWaveformLecroy.cpp +++ b/src/AcquireWaveformLecroy.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.12 2008-04-24 14:59:23 xavela Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroy.cpp,v 1.13 2010-03-26 09:11:31 vince_soleil Exp $"; //+============================================================================= // // file : AcquireWaveformLecroy.cpp @@ -11,11 +11,16 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio // // project : TANGO Device Server // -// $Author: xavela $ +// $Author: vince_soleil $ // -// $Revision: 1.12 $ +// $Revision: 1.13 $ // // $Log: not supported by cvs2svn $ +// Revision 1.12 2008/04/24 14:59:23 xavela +// xavier : +// - SocketLecroy file splitted for Win32 and Linux like platforms +// - Bugs fixed in SocketLecroy +// // Revision 1.11 2008/04/24 13:08:44 syldup // no message // @@ -101,19 +106,19 @@ namespace AcquireWaveformLecroy_ns // //----------------------------------------------------------------------------- AcquireWaveformLecroy::AcquireWaveformLecroy(Tango::DeviceClass *cl,string &s) -:Tango::Device_3Impl(cl,s.c_str()) +:Tango::Device_4Impl(cl,s.c_str()) { init_device(); } AcquireWaveformLecroy::AcquireWaveformLecroy(Tango::DeviceClass *cl,const char *s) -:Tango::Device_3Impl(cl,s) +:Tango::Device_4Impl(cl,s) { init_device(); } AcquireWaveformLecroy::AcquireWaveformLecroy(Tango::DeviceClass *cl,const char *s,const char *d) -:Tango::Device_3Impl(cl,s,d) +:Tango::Device_4Impl(cl,s,d) { init_device(); } diff --git a/src/AcquireWaveformLecroyClass.cpp b/src/AcquireWaveformLecroyClass.cpp index 9a8c747fd0294d5683a2487e8ef3a244139d82bc..7814404d9d66d7796c8a47495b3ee7ea45c66134 100644 --- a/src/AcquireWaveformLecroyClass.cpp +++ b/src/AcquireWaveformLecroyClass.cpp @@ -1,4 +1,4 @@ -static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.8 2008-04-24 13:08:44 syldup Exp $"; +static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/AcquireWaveformLecroy/src/AcquireWaveformLecroyClass.cpp,v 1.9 2010-03-26 09:11:31 vince_soleil Exp $"; static const char *TagName = "$Name: not supported by cvs2svn $"; @@ -18,11 +18,14 @@ static const char *RCSfile = "$RCSfile: AcquireWaveformLecroyClass.cpp,v $"; // // project : TANGO Device Server // -// $Author: syldup $ +// $Author: vince_soleil $ // -// $Revision: 1.8 $ +// $Revision: 1.9 $ // // $Log: not supported by cvs2svn $ +// Revision 1.8 2008/04/24 13:08:44 syldup +// no message +// // Revision 1.7 2008/02/28 09:02:05 xavela // xavier : // StateMachine file added !! (oups) @@ -508,7 +511,7 @@ void AcquireWaveformLecroyClass::write_class_property() // Put inheritance Tango::DbDatum inher_datum("InheritedFrom"); vector<string> inheritance; - inheritance.push_back("Device_3Impl"); + inheritance.push_back("Device_4Impl"); inher_datum << inheritance; data.push_back(inher_datum);