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

"Migration_Tango7_Part2"

parent 64f5832b
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>PulseGeneration-${aol}-${mode}</artifactId>
<version>1.1.8</version>
<version>1.1.9</version>
<packaging>nar</packaging>
<name>PulseGeneration</name>
<description>PulseGeneration device</description>
......
......@@ -69,7 +69,7 @@ namespace PulseGeneration_ns
// - s : Device name
//
//-----------------------------------------------------------------------------
PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,string &s):Tango::Device_3Impl(cl,s.c_str())
PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,string &s):Tango::Device_4Impl(cl,s.c_str())
{
pulse_number =1;
generation_type = "CONTINUOUS";
......@@ -94,7 +94,7 @@ PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,string &s):Tango::Device
init_device();
}
PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,const char *s):Tango::Device_3Impl(cl,s)
PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,const char *s):Tango::Device_4Impl(cl,s)
{
pulse_number =1;
generation_type = "CONTINUOUS";
......@@ -119,7 +119,7 @@ PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,const char *s):Tango::De
}
PulseGeneration::PulseGeneration(Tango::DeviceClass *cl,const char *s,const char *d)
:Tango::Device_3Impl(cl,s,d)
:Tango::Device_4Impl(cl,s,d)
{
pulse_number =1;
generation_type = "CONTINUOUS";
......
......@@ -1143,7 +1143,7 @@ void PulseGenerationClass::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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment