diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp index f5ba092d89c9eb27907a3c1be985530aae278d9a..a31f583ea274b1cbf8640e96f419174008a1a2ea 100644 --- a/src/KeithleyDDCProtocol.cpp +++ b/src/KeithleyDDCProtocol.cpp @@ -428,7 +428,7 @@ std::string argout("no data"); cmd_to_send << "U0X" << std::endl; argout = _communication_link->write_read(cmd_to_send.str()); - std::cout << "\n\nKeithleyDDCProtocol::get_DDC_configuration returns *" << argout << "*" << std::ends; +// std::cout << "\n\nKeithleyDDCProtocol::get_DDC_configuration returns *" << argout << "*" << std::ends; return argout; } diff --git a/src/TangoGpibLink.cpp b/src/TangoGpibLink.cpp index 1ce95d57da0de2e61b49a0bc26fb41825eba09e6..e4041f7074ea73f60a1eb6bde8d09c3dcc2b9063 100644 --- a/src/TangoGpibLink.cpp +++ b/src/TangoGpibLink.cpp @@ -57,7 +57,7 @@ TangoGpibLink::~TangoGpibLink (void) // ============================================================================ void TangoGpibLink::create_gpib_proxy (void) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); try { @@ -67,12 +67,12 @@ void TangoGpibLink::create_gpib_proxy (void) throw (Tango::DevFailed) } catch(Tango::DevFailed& df ) { - description << "Unable to create proxy on : " << _communication_Device_name << ends; + description = "Unable to create proxy on : " + _communication_Device_name; _is_gpib_proxy_created = false; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::create_gpib_proxy"); } @@ -84,7 +84,7 @@ void TangoGpibLink::create_gpib_proxy (void) throw (Tango::DevFailed) // ============================================================================ void TangoGpibLink::write (std::string command_to_send) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); if(!_is_gpib_proxy_created) create_gpib_proxy(); @@ -96,11 +96,11 @@ void TangoGpibLink::write (std::string command_to_send) throw (Tango::DevFailed } catch(Tango::DevFailed& df ) { - description << "Unable to write command : " << command_to_send << ends; + description = "Unable to write command : " + command_to_send; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::write"); } @@ -138,7 +138,7 @@ std::string TangoGpibLink::read (void) throw (Tango::DevFailed) // ============================================================================ std::string TangoGpibLink::write_read (std::string command_to_send) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); if(!_is_gpib_proxy_created) create_gpib_proxy(); @@ -152,11 +152,11 @@ std::string TangoGpibLink::write_read (std::string command_to_send) throw (Tango } catch(Tango::DevFailed& df ) { - description << "Unable to write command : " << command_to_send << " and read device response." << ends; + description = "Unable to write command : " + command_to_send + " and read device response."; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::write_read"); } @@ -168,7 +168,7 @@ std::string TangoGpibLink::write_read (std::string command_to_send) throw (Tango // ============================================================================ bool TangoGpibLink::SRQLineState (void) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); bool result = false; if(!_is_gpib_proxy_created) @@ -183,11 +183,11 @@ bool TangoGpibLink::SRQLineState (void) throw (Tango::DevFailed) } catch(Tango::DevFailed& df ) { - description << "Unable to get Gpib SRQ line state." << ends; + description = "Unable to get Gpib SRQ line state."; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::SRQLineState"); } @@ -199,7 +199,7 @@ bool TangoGpibLink::SRQLineState (void) throw (Tango::DevFailed) // ============================================================================ short TangoGpibLink::readStatusByteRegister (void) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); short result = -1; if(!_is_gpib_proxy_created) @@ -214,11 +214,11 @@ short TangoGpibLink::readStatusByteRegister (void) throw (Tango::DevFailed) } catch(Tango::DevFailed& df ) { - description << "Unable to get device status byte register." << ends; + description = "Unable to get device status byte register."; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::readStatusByteRegister"); } @@ -230,7 +230,7 @@ short TangoGpibLink::readStatusByteRegister (void) throw (Tango::DevFailed) // ============================================================================ void TangoGpibLink::clear (void) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); if(!_is_gpib_proxy_created) create_gpib_proxy(); @@ -242,11 +242,11 @@ void TangoGpibLink::clear (void) throw (Tango::DevFailed) } catch(Tango::DevFailed& df ) { - description << "Unable send Clear Device command." << ends; + description = "Unable send Clear Device command."; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::clear"); } @@ -258,7 +258,7 @@ void TangoGpibLink::clear (void) throw (Tango::DevFailed) // ============================================================================ void TangoGpibLink::trigger (void) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); if(!_is_gpib_proxy_created) create_gpib_proxy(); @@ -270,11 +270,11 @@ void TangoGpibLink::trigger (void) throw (Tango::DevFailed) } catch(Tango::DevFailed& df ) { - description << "Unable send Trigger command." << ends; + description = "Unable send Trigger command."; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoGpibLink::clear"); } diff --git a/src/TangoSerialLink.cpp b/src/TangoSerialLink.cpp index e87c01b2f8c0f07b5f725498f47da443713515c2..7844882bf75fe4e80b07bc6fb39dabce6ebf5b57 100644 --- a/src/TangoSerialLink.cpp +++ b/src/TangoSerialLink.cpp @@ -60,7 +60,7 @@ TangoSerialLink::~TangoSerialLink (void) // ============================================================================ void TangoSerialLink::create_serial_proxy (void) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); try { @@ -70,12 +70,12 @@ void TangoSerialLink::create_serial_proxy (void) throw (Tango::DevFailed) } catch(Tango::DevFailed& df ) { - description << "Unable to create proxy on : " << _communication_Device_name << ends; + description = "Unable to create proxy on : " + _communication_Device_name; _is_serial_proxy_created = false; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoSerialLink::create_serial_proxy"); } @@ -86,7 +86,7 @@ void TangoSerialLink::create_serial_proxy (void) throw (Tango::DevFailed) // ============================================================================ void TangoSerialLink::write (std::string command_to_send) throw (Tango::DevFailed) { - TangoSys_OMemStream description; + std::string description(""); if(!_is_serial_proxy_created) create_serial_proxy(); @@ -98,11 +98,11 @@ void TangoSerialLink::write (std::string command_to_send) throw (Tango::DevFail } catch(Tango::DevFailed& df ) { - description << "Unable to write command : " << command_to_send << ends; + description = "Unable to write command : " + command_to_send; Tango::Except::re_throw_exception (df, (const char*)"COMMUNICATION_ERROR", - description.str(), + description.c_str(), (const char*)"TangoSerialLink::write"); } @@ -139,7 +139,6 @@ std::string TangoSerialLink::read (void) throw (Tango::DevFailed) // ============================================================================ std::string TangoSerialLink::write_read (std::string command_to_send) throw (Tango::DevFailed) { - TangoSys_OMemStream description; std::string respTmp(""); // long nb_char_written = 0;