Commit da676e87 authored by Thomas Braun's avatar Thomas Braun
Browse files

Add logging macros to fix compilation 

Since the recent removal of coutX from cppTango main in c934adea (Merge
branch 'remove-cout-definition' into 'main', 2022-05-23) we have to use
the new names. But as we also want to be able to compile against older
cppTango versions we now use the compatibility macros in Logging.h.
parent ebef66e3

AbstractClasses/AccessControlClass.cpp

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 


#include <AccessControlClass.h>



#include "../TangoAccessControl/Logging.h"



/*----- PROTECTED REGION END -----*/	//	AccessControlClass.cpp



//-------------------------------------------------------------------
@@ -88,14 +90,14 @@ AccessControlClass *AccessControlClass::_instance = NULL; 
//--------------------------------------------------------

AccessControlClass::AccessControlClass(string &s):Tango::DeviceClass(s)

{

	cout2 << "Entering AccessControlClass constructor" << endl;

	TANGO_LOG_INFO << "Entering AccessControlClass constructor" << endl;

	set_default_property();

	write_class_property();



	/*----- PROTECTED REGION ID(AccessControlClass::constructor) ENABLED START -----*/

	/*----- PROTECTED REGION END -----*/	//	AccessControlClass::constructor



	cout2 << "Leaving AccessControlClass constructor" << endl;

	TANGO_LOG_INFO << "Leaving AccessControlClass constructor" << endl;

}



//--------------------------------------------------------

TangoAccessControl/Logging.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef LOGGING_H

#define LOGGING_H



#ifdef TANGO_LOG

  // cppTango after c934adea (Merge branch 'remove-cout-definition' into 'main', 2022-05-23)

  // nothing to do

#else

  // cppTango 9.3-backports and older

  #define TANGO_LOG       cout

  #define TANGO_LOG_INFO  cout2

  #define TANGO_LOG_DEBUG cout3

#endif // TANGO_LOG



#endif // LOGGING_H

TangoAccessControl/TangoAccessControlClass.cpp

+23 −21
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#include <TangoAccessControl.h>

#include <TangoAccessControlClass.h>



#include "Logging.h"



/*----- PROTECTED REGION END -----*/	//	TangoAccessControlClass.cpp



//-------------------------------------------------------------------
@@ -84,14 +86,14 @@ TangoAccessControlClass *TangoAccessControlClass::_instance = NULL; 
//--------------------------------------------------------

TangoAccessControlClass::TangoAccessControlClass(string &s):AccessControl_ns::AccessControlClass(s)

{

	cout2 << "Entering TangoAccessControlClass constructor" << endl;

	TANGO_LOG_INFO << "Entering TangoAccessControlClass constructor" << endl;

	set_default_property();

	write_class_property();



	/*----- PROTECTED REGION ID(TangoAccessControlClass::constructor) ENABLED START -----*/	

	/*----- PROTECTED REGION END -----*/	//	TangoAccessControlClass::constructor



	cout2 << "Leaving TangoAccessControlClass constructor" << endl;

	TANGO_LOG_INFO << "Leaving TangoAccessControlClass constructor" << endl;

}



//--------------------------------------------------------
@@ -171,7 +173,7 @@ TangoAccessControlClass *TangoAccessControlClass::instance() 
//--------------------------------------------------------

CORBA::Any *AddAddressForUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "AddAddressForUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "AddAddressForUserClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	((static_cast<TangoAccessControl *>(device))->add_address_for_user(argin));
@@ -191,7 +193,7 @@ CORBA::Any *AddAddressForUserClass::execute(Tango::DeviceImpl *device, const COR 
//--------------------------------------------------------

CORBA::Any *AddDeviceForUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "AddDeviceForUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "AddDeviceForUserClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	((static_cast<TangoAccessControl *>(device))->add_device_for_user(argin));
@@ -211,7 +213,7 @@ CORBA::Any *AddDeviceForUserClass::execute(Tango::DeviceImpl *device, const CORB 
//--------------------------------------------------------

CORBA::Any *CloneUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "CloneUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "CloneUserClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	((static_cast<TangoAccessControl *>(device))->clone_user(argin));
@@ -231,7 +233,7 @@ CORBA::Any *CloneUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any 
//--------------------------------------------------------

CORBA::Any *GetAccessClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "GetAccessClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetAccessClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	return insert((static_cast<TangoAccessControl *>(device))->get_access(argin));
@@ -250,7 +252,7 @@ CORBA::Any *GetAccessClass::execute(Tango::DeviceImpl *device, const CORBA::Any 
//--------------------------------------------------------

CORBA::Any *GetAccessForMultiIPClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "GetAccessForMultiIPClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetAccessForMultiIPClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	return insert((static_cast<TangoAccessControl *>(device))->get_access_for_multi_ip(argin));
@@ -269,7 +271,7 @@ CORBA::Any *GetAccessForMultiIPClass::execute(Tango::DeviceImpl *device, const C 
//--------------------------------------------------------

CORBA::Any *GetAddressByUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "GetAddressByUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetAddressByUserClass::execute(): arrived" << endl;

	Tango::DevString argin;

	extract(in_any, argin);

	return insert((static_cast<TangoAccessControl *>(device))->get_address_by_user(argin));
@@ -288,7 +290,7 @@ CORBA::Any *GetAddressByUserClass::execute(Tango::DeviceImpl *device, const CORB 
//--------------------------------------------------------

CORBA::Any *GetAllowedCommandClassListClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))

{

	cout2 << "GetAllowedCommandClassListClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetAllowedCommandClassListClass::execute(): arrived" << endl;

	return insert((static_cast<TangoAccessControl *>(device))->get_allowed_command_class_list());

}
@@ -305,7 +307,7 @@ CORBA::Any *GetAllowedCommandClassListClass::execute(Tango::DeviceImpl *device, 
//--------------------------------------------------------

CORBA::Any *GetAllowedCommandsClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "GetAllowedCommandsClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetAllowedCommandsClass::execute(): arrived" << endl;

	Tango::DevString argin;

	extract(in_any, argin);

	return insert((static_cast<TangoAccessControl *>(device))->get_allowed_commands(argin));
@@ -324,7 +326,7 @@ CORBA::Any *GetAllowedCommandsClass::execute(Tango::DeviceImpl *device, const CO 
//--------------------------------------------------------

CORBA::Any *GetDeviceByUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "GetDeviceByUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetDeviceByUserClass::execute(): arrived" << endl;

	Tango::DevString argin;

	extract(in_any, argin);

	return insert((static_cast<TangoAccessControl *>(device))->get_device_by_user(argin));
@@ -343,7 +345,7 @@ CORBA::Any *GetDeviceByUserClass::execute(Tango::DeviceImpl *device, const CORBA 
//--------------------------------------------------------

CORBA::Any *GetDeviceClassClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "GetDeviceClassClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetDeviceClassClass::execute(): arrived" << endl;

	Tango::DevString argin;

	extract(in_any, argin);

	return insert((static_cast<TangoAccessControl *>(device))->get_device_class(argin));
@@ -362,7 +364,7 @@ CORBA::Any *GetDeviceClassClass::execute(Tango::DeviceImpl *device, const CORBA: 
//--------------------------------------------------------

CORBA::Any *GetUsersClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))

{

	cout2 << "GetUsersClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "GetUsersClass::execute(): arrived" << endl;

	return insert((static_cast<TangoAccessControl *>(device))->get_users());

}
@@ -379,7 +381,7 @@ CORBA::Any *GetUsersClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const 
//--------------------------------------------------------

CORBA::Any *RegisterServiceClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))

{

	cout2 << "RegisterServiceClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "RegisterServiceClass::execute(): arrived" << endl;

	((static_cast<TangoAccessControl *>(device))->register_service());

	return new CORBA::Any();

}
@@ -397,7 +399,7 @@ CORBA::Any *RegisterServiceClass::execute(Tango::DeviceImpl *device, TANGO_UNUSE 
//--------------------------------------------------------

CORBA::Any *RemoveAddressForUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "RemoveAddressForUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "RemoveAddressForUserClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	((static_cast<TangoAccessControl *>(device))->remove_address_for_user(argin));
@@ -417,7 +419,7 @@ CORBA::Any *RemoveAddressForUserClass::execute(Tango::DeviceImpl *device, const 
//--------------------------------------------------------

CORBA::Any *RemoveDeviceForUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "RemoveDeviceForUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "RemoveDeviceForUserClass::execute(): arrived" << endl;

	const Tango::DevVarStringArray *argin;

	extract(in_any, argin);

	((static_cast<TangoAccessControl *>(device))->remove_device_for_user(argin));
@@ -437,7 +439,7 @@ CORBA::Any *RemoveDeviceForUserClass::execute(Tango::DeviceImpl *device, const C 
//--------------------------------------------------------

CORBA::Any *RemoveUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)

{

	cout2 << "RemoveUserClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "RemoveUserClass::execute(): arrived" << endl;

	Tango::DevString argin;

	extract(in_any, argin);

	((static_cast<TangoAccessControl *>(device))->remove_user(argin));
@@ -457,7 +459,7 @@ CORBA::Any *RemoveUserClass::execute(Tango::DeviceImpl *device, const CORBA::Any 
//--------------------------------------------------------

CORBA::Any *UnregisterServiceClass::execute(Tango::DeviceImpl *device, TANGO_UNUSED(const CORBA::Any &in_any))

{

	cout2 << "UnregisterServiceClass::execute(): arrived" << endl;

	TANGO_LOG_INFO << "UnregisterServiceClass::execute(): arrived" << endl;

	((static_cast<TangoAccessControl *>(device))->unregister_service());

	return new CORBA::Any();

}
@@ -601,7 +603,7 @@ void TangoAccessControlClass::device_factory(const Tango::DevVarStringArray *dev 
	//	Create devices and add it into the device list

	for (unsigned long i=0 ; i<devlist_ptr->length() ; i++)

	{

		cout4 << "Device name : " << (*devlist_ptr)[i].in() << endl;

		TANGO_LOG_DEBUG << "Device name : " << (*devlist_ptr)[i].in() << endl;

		device_list.push_back(new TangoAccessControl(this, (*devlist_ptr)[i]));							 

	}
@@ -951,7 +953,7 @@ void TangoAccessControlClass::create_static_attribute_list(vector<Tango::Attr *> 
		defaultAttList.push_back(att_name);

	}



	cout2 << defaultAttList.size() << " attributes in default list" << endl;

	TANGO_LOG_INFO << defaultAttList.size() << " attributes in default list" << endl;



	/*----- PROTECTED REGION ID(TangoAccessControlClass::create_static_att_list) ENABLED START -----*/
@@ -987,7 +989,7 @@ void TangoAccessControlClass::erase_dynamic_attributes(const Tango::DevVarString 
			vector<string>::iterator ite_str = find(defaultAttList.begin(), defaultAttList.end(), att_name);

			if (ite_str == defaultAttList.end())

			{

				cout2 << att_name << " is a UNWANTED dynamic attribute for device " << (*devlist_ptr)[i] << endl;

				TANGO_LOG_INFO << att_name << " is a UNWANTED dynamic attribute for device " << (*devlist_ptr)[i] << endl;

				Tango::Attribute &att = dev->get_device_attr()->get_attr_by_name(att_name.c_str());

				dev->remove_attribute(att_list[att.get_attr_idx()], true, false);

				--ite_att;

TangoAccessControl/main.cpp

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 


#include <tango.h>



#include "Logging.h"





int main(int argc,char *argv[])

{