Skip to content
This repository has been archived by the owner on Apr 7, 2022. It is now read-only.

Commit

Permalink
Merge pull request #397 from beenje/add-std-prefix
Browse files Browse the repository at this point in the history 
Add std namespace prefix in C++ code
  • Loading branch information
@ajoubertza
ajoubertza authored Dec 15, 2020
2 parents 678c1f1 + ac564fa commit e93e5df
Show file tree
Hide file tree
Showing 33 changed files with 477 additions and 477 deletions.
22 changes: 11 additions & 11 deletions examples/interfacechangeEvents/IfchangeServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ namespace IfchangeServer_ns
* implementing the classIfchangeServer
*/
//--------------------------------------------------------
IfchangeServer::IfchangeServer(Tango::DeviceClass *cl, string &s)
IfchangeServer::IfchangeServer(Tango::DeviceClass *cl, std::string &s)
: TANGO_BASE_CLASS(cl, s.c_str())
{
/*----- PROTECTED REGION ID(IfchangeServer::constructor_1) ENABLED START -----*/
Expand Down Expand Up @@ -118,7 +118,7 @@ IfchangeServer::IfchangeServer(Tango::DeviceClass *cl, const char *s, const char
//--------------------------------------------------------
void IfchangeServer::delete_device()
{
DEBUG_STREAM << "IfchangeServer::delete_device() " << device_name << endl;
DEBUG_STREAM << "IfchangeServer::delete_device() " << device_name << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::delete_device) ENABLED START -----*/

// Delete device allocated objects
Expand All @@ -135,7 +135,7 @@ void IfchangeServer::delete_device()
//--------------------------------------------------------
void IfchangeServer::init_device()
{
DEBUG_STREAM << "IfchangeServer::init_device() create device " << device_name << endl;
DEBUG_STREAM << "IfchangeServer::init_device() create device " << device_name << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::init_device_before) ENABLED START -----*/

// Initialization before get_device_property() call
Expand Down Expand Up @@ -163,7 +163,7 @@ void IfchangeServer::init_device()
//--------------------------------------------------------
void IfchangeServer::always_executed_hook()
{
DEBUG_STREAM << "IfchangeServer::always_executed_hook() " << device_name << endl;
DEBUG_STREAM << "IfchangeServer::always_executed_hook() " << device_name << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::always_executed_hook) ENABLED START -----*/

// code always executed before all requests
Expand All @@ -177,9 +177,9 @@ void IfchangeServer::always_executed_hook()
* Description : Hardware acquisition for attributes
*/
//--------------------------------------------------------
void IfchangeServer::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
void IfchangeServer::read_attr_hardware(TANGO_UNUSED(std::vector<long> &attr_list))
{
DEBUG_STREAM << "IfchangeServer::read_attr_hardware(vector<long> &attr_list) entering... " << endl;
DEBUG_STREAM << "IfchangeServer::read_attr_hardware(std::vector<long> &attr_list) entering... " << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::read_attr_hardware) ENABLED START -----*/

// Add your own code
Expand All @@ -198,7 +198,7 @@ void IfchangeServer::read_attr_hardware(TANGO_UNUSED(vector<long> &attr_list))
//--------------------------------------------------------
void IfchangeServer::read_busy(Tango::Attribute &attr)
{
DEBUG_STREAM << "IfchangeServer::read_busy(Tango::Attribute &attr) entering... " << endl;
DEBUG_STREAM << "IfchangeServer::read_busy(Tango::Attribute &attr) entering... " << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::read_busy) ENABLED START -----*/
// Set the attribute value
*attr_busy_read = true;
Expand All @@ -218,7 +218,7 @@ void IfchangeServer::read_busy(Tango::Attribute &attr)
//--------------------------------------------------------
void IfchangeServer::read_ioattr(Tango::Attribute &attr)
{
DEBUG_STREAM << "IfchangeServer::read_ioattr(Tango::Attribute &attr) entering... " << endl;
DEBUG_STREAM << "IfchangeServer::read_ioattr(Tango::Attribute &attr) entering... " << std::endl;
Tango::DevDouble *att_value = get_ioattr_data_ptr(attr.get_name());
/*----- PROTECTED REGION ID(IfchangeServer::read_ioattr) ENABLED START -----*/
// Set the attribute value
Expand Down Expand Up @@ -254,7 +254,7 @@ void IfchangeServer::add_dynamic_attributes()
//--------------------------------------------------------
void IfchangeServer::add_dynamic()
{
DEBUG_STREAM << "IfchangeServer::Add_dynamic() - " << device_name << endl;
DEBUG_STREAM << "IfchangeServer::Add_dynamic() - " << device_name << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::add_dynamic) ENABLED START -----*/

add_iocmd_dynamic_command("test_dynamic_Command", true);
Expand All @@ -272,7 +272,7 @@ void IfchangeServer::add_dynamic()
//--------------------------------------------------------
void IfchangeServer::delete__dynamic()
{
DEBUG_STREAM << "IfchangeServer::Delete_Dynamic() - " << device_name << endl;
DEBUG_STREAM << "IfchangeServer::Delete_Dynamic() - " << device_name << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::delete__dynamic) ENABLED START -----*/

remove_iocmd_dynamic_command("test_dynamic_Command");
Expand All @@ -290,7 +290,7 @@ void IfchangeServer::delete__dynamic()
//--------------------------------------------------------
void IfchangeServer::iocmd(Tango::Command &command)
{
DEBUG_STREAM << "IfchangeServer::" << command.get_name() << " - " << device_name << endl;
DEBUG_STREAM << "IfchangeServer::" << command.get_name() << " - " << device_name << std::endl;
/*----- PROTECTED REGION ID(IfchangeServer::iocmd) ENABLED START -----*/

// Add your own code
Expand Down
16 changes: 8 additions & 8 deletions examples/interfacechangeEvents/IfchangeServer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class IfchangeServer : public TANGO_BASE_CLASS
* @param cl Class.
* @param s Device Name
*/
IfchangeServer(Tango::DeviceClass *cl,string &s);
IfchangeServer(Tango::DeviceClass *cl,std::string &s);
/**
* Constructs a newly device object.
*
Expand Down Expand Up @@ -124,7 +124,7 @@ class IfchangeServer : public TANGO_BASE_CLASS
* Description : Hardware acquisition for attributes.
*/
//--------------------------------------------------------
virtual void read_attr_hardware(vector<long> &attr_list);
virtual void read_attr_hardware(std::vector<long> &attr_list);

/**
* Attribute busy related methods
Expand All @@ -148,10 +148,10 @@ class IfchangeServer : public TANGO_BASE_CLASS
*/
virtual void read_ioattr(Tango::Attribute &attr);
virtual bool is_ioattr_allowed(Tango::AttReqType type);
void add_ioattr_dynamic_attribute(string attname);
void remove_ioattr_dynamic_attribute(string attname);
Tango::DevDouble *get_ioattr_data_ptr(string &name);
map<string,Tango::DevDouble> ioattr_data;
void add_ioattr_dynamic_attribute(std::string attname);
void remove_ioattr_dynamic_attribute(std::string attname);
Tango::DevDouble *get_ioattr_data_ptr(std::string &name);
map<std::string,Tango::DevDouble> ioattr_data;

//--------------------------------------------------------
/**
Expand Down Expand Up @@ -190,8 +190,8 @@ class IfchangeServer : public TANGO_BASE_CLASS
*/
virtual void iocmd(Tango::Command &command);
virtual bool is_iocmd_allowed(const CORBA::Any &any);
void add_iocmd_dynamic_command(string cmdname, bool device);
void remove_iocmd_dynamic_command(string cmdname);
void add_iocmd_dynamic_command(std::string cmdname, bool device);
void remove_iocmd_dynamic_command(std::string cmdname);

//--------------------------------------------------------
/**
Expand Down
Loading

0 comments on commit e93e5df

Please sign in to comment.