Skip to content
Snippets Groups Projects
Commit e8da143a authored by Nicolas Leclercq's avatar Nicolas Leclercq
Browse files

Fixed win32 vc8 compil errors

parent 0aeb0586
Branches
Tags
No related merge requests found
......@@ -699,7 +699,7 @@ namespace LFI_3751_ns
{
DEBUG_STREAM << "write_read(): entering... cmd_to_send =" << cmd_to_send << endl;
Tango::DevString response="";
std::string response = "";
long nb_char_written;
long readMode = 2; //- SL_LINE : waits for LF (newline set in device Serial)
......@@ -716,7 +716,7 @@ namespace LFI_3751_ns
//omni_thread::sleep(0,50000000);
mySerial->command_inout("DevSerReadString", readMode, response);
return string(response);
return response;
}//endtry
......@@ -849,14 +849,14 @@ namespace LFI_3751_ns
if(index_point==2)
{
data = data.substr(1,index_point+3);
data = data.insert(0,'0');
formated_data = data.insert(0,'0');
data = data.insert(0,"0");
formated_data = data.insert(0,"0");
}
if(index_point==3)
{
data = data.substr(1,index_point+3);
formated_data = data.insert(0,'0');
formated_data = data.insert(0,"0");
}
if(index_point==4)
......@@ -875,14 +875,14 @@ namespace LFI_3751_ns
if(index_point==1)
{
data = data.substr(0,index_point+4);
data = data.insert(0,'0');
formated_data = data.insert(0,'0');
data = data.insert(0,"0");
formated_data = data.insert(0,"0");
}
if(index_point==2)
{
data = data.substr(0,index_point+4);
formated_data = data.insert(0,'0');
formated_data = data.insert(0,"0");
}
if(index_point==3)
......
......@@ -198,7 +198,7 @@ void LFI_3751Class::command_factory()
//+----------------------------------------------------------------------------
Tango::DbDatum LFI_3751Class::get_class_property(string &prop_name)
{
for (int i=0 ; i<cl_prop.size() ; i++)
for (unsigned int i=0 ; i<cl_prop.size() ; i++)
if (cl_prop[i].name == prop_name)
return cl_prop[i];
// if not found, return an empty DbDatum
......@@ -213,7 +213,7 @@ Tango::DbDatum LFI_3751Class::get_class_property(string &prop_name)
//-----------------------------------------------------------------------------
Tango::DbDatum LFI_3751Class::get_default_device_property(string &prop_name)
{
for (int i=0 ; i<dev_def_prop.size() ; i++)
for (unsigned int i=0 ; i<dev_def_prop.size() ; i++)
if (dev_def_prop[i].name == prop_name)
return dev_def_prop[i];
// if not found, return an empty DbDatum
......@@ -229,7 +229,7 @@ Tango::DbDatum LFI_3751Class::get_default_device_property(string &prop_name)
//-----------------------------------------------------------------------------
Tango::DbDatum LFI_3751Class::get_default_class_property(string &prop_name)
{
for (int i=0 ; i<cl_def_prop.size() ; i++)
for (unsigned int i=0 ; i<cl_def_prop.size() ; i++)
if (cl_def_prop[i].name == prop_name)
return cl_def_prop[i];
// if not found, return an empty DbDatum
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment