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

"Migration_Tango7_Part2"

parent 8d017c24
Branches
Tags
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>FemtoCurrentAmplifier-${aol}-${mode}</artifactId> <artifactId>FemtoCurrentAmplifier-${aol}-${mode}</artifactId>
<version>1.3.3</version> <version>1.3.4</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>FemtoCurrentAmplifier</name> <name>FemtoCurrentAmplifier</name>
<!-- use for the name of executable --> <!-- use for the name of executable -->
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifier.cpp,v 1.15 2008-10-15 16:50:41 flanglois Exp $"; static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifier.cpp,v 1.16 2010-03-26 09:22:44 vince_soleil Exp $";
//+============================================================================= //+=============================================================================
// //
// file : FemtoCurrentAmplifier.cpp // file : FemtoCurrentAmplifier.cpp
...@@ -11,9 +11,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio ...@@ -11,9 +11,9 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
// //
// project : TANGO Device Server // project : TANGO Device Server
// //
// $Author: flanglois $ // $Author: vince_soleil $
// //
// $Revision: 1.15 $ // $Revision: 1.16 $
// //
// $Log: not supported by cvs2svn $ // $Log: not supported by cvs2svn $
// //
...@@ -83,19 +83,19 @@ namespace FemtoCurrentAmplifier_ns ...@@ -83,19 +83,19 @@ namespace FemtoCurrentAmplifier_ns
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
FemtoCurrentAmplifier::FemtoCurrentAmplifier(Tango::DeviceClass *cl,string &s) FemtoCurrentAmplifier::FemtoCurrentAmplifier(Tango::DeviceClass *cl,string &s)
:Tango::Device_3Impl(cl,s.c_str()) :Tango::Device_4Impl(cl,s.c_str())
{ {
init_device(); init_device();
} }
FemtoCurrentAmplifier::FemtoCurrentAmplifier(Tango::DeviceClass *cl,const char *s) FemtoCurrentAmplifier::FemtoCurrentAmplifier(Tango::DeviceClass *cl,const char *s)
:Tango::Device_3Impl(cl,s) :Tango::Device_4Impl(cl,s)
{ {
init_device(); init_device();
} }
FemtoCurrentAmplifier::FemtoCurrentAmplifier(Tango::DeviceClass *cl,const char *s,const char *d) FemtoCurrentAmplifier::FemtoCurrentAmplifier(Tango::DeviceClass *cl,const char *s,const char *d)
:Tango::Device_3Impl(cl,s,d) :Tango::Device_4Impl(cl,s,d)
{ {
init_device(); init_device();
} }
......
static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifierClass.cpp,v 1.5 2007-09-19 12:22:32 flanglois Exp $"; static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifierClass.cpp,v 1.6 2010-03-26 09:22:44 vince_soleil Exp $";
static const char *TagName = "$Name: not supported by cvs2svn $"; static const char *TagName = "$Name: not supported by cvs2svn $";
...@@ -20,9 +20,9 @@ static const char *RCSfile = "$RCSfile: FemtoCurrentAmplifierClass.cpp,v $"; ...@@ -20,9 +20,9 @@ static const char *RCSfile = "$RCSfile: FemtoCurrentAmplifierClass.cpp,v $";
// //
// project : TANGO Device Server // project : TANGO Device Server
// //
// $Author: flanglois $ // $Author: vince_soleil $
// //
// $Revision: 1.5 $ // $Revision: 1.6 $
// //
// $Log: not supported by cvs2svn $ // $Log: not supported by cvs2svn $
// //
...@@ -661,7 +661,7 @@ void FemtoCurrentAmplifierClass::write_class_property() ...@@ -661,7 +661,7 @@ void FemtoCurrentAmplifierClass::write_class_property()
// Put inheritance // Put inheritance
Tango::DbDatum inher_datum("InheritedFrom"); Tango::DbDatum inher_datum("InheritedFrom");
vector<string> inheritance; vector<string> inheritance;
inheritance.push_back("Device_3Impl"); inheritance.push_back("Device_4Impl");
inher_datum << inheritance; inher_datum << inheritance;
data.push_back(inher_datum); data.push_back(inher_datum);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment