test/testdevice/src/ClassFactory.cpp

@@ -18,7 +18,7 @@
 //=============================================================================
 
 
-#include <tango.h>
+#include <tango/tango.h>
 #include <TestDeviceClass.h>
 
 //	Add class header files if needed

test/testdevice/src/TestDevice.cpp

@@ -1609,7 +1609,7 @@ void TestDevice::set_write_value(Tango::DevString value, string attrname)
 CORBA::Any *CmdClass::execute(Tango::DeviceImpl *device,const CORBA::Any &in_any)
 {
 
-	cout << "CmdClass::" << get_name() << ": entering..." << endl;
+	TANGO_LOG << "CmdClass::" << get_name() << ": entering..." << endl;
 
 	//const Tango::DevVarLongArray	*argin;
 	//extract(in_any, argin);

test/testdevice/src/TestDevice.h

@@ -18,11 +18,21 @@
 #define TestDevice_H
 
 
-#include <tango.h>
+#include <tango/tango.h>
 
 #define MAX_ATTR_SIZE 3000
 #define MAX_SPECTRUM_SIZE	100
 
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+#ifndef TANGO_LOG_INFO
+#define TANGO_LOG_INFO cout2
+#endif
+#ifndef TANGO_LOG_DEBUG
+#define TANGO_LOG_DEBUG cout4
+#endif
+
 /*----- PROTECTED REGION END -----*/
 
 
@@ -34,6 +44,7 @@
 namespace TestDevice_ns
 {
 	/*----- PROTECTED REGION ID(TestDevice::Additional Class Declarations) ENABLED START -----*/
+    using namespace std;
 
 	//		Additional Class Declarations
 typedef struct {
@@ -53,7 +64,6 @@ enum { typeDouble, typeLong, typeBool, typeString, typeUchar};
 
 class TestDevice : public TANGO_BASE_CLASS
 {
-
 	friend class CmdClass;
 	/*----- PROTECTED REGION ID(TestDevice::Data Members) ENABLED START -----*/
 

test/testdevice/src/TestDeviceClass.cpp

@@ -60,7 +60,7 @@ TestDeviceClass *TestDeviceClass::_instance = NULL;
 //--------------------------------------------------------
 TestDeviceClass::TestDeviceClass(string &s):DeviceClass(s)
 {
-	cout2 << "Entering TestDeviceClass constructor" << endl;
+	TANGO_LOG_INFO << "Entering TestDeviceClass constructor" << endl;
 	set_default_property();
 	get_class_property();
 	write_class_property();
@@ -69,7 +69,7 @@ TestDeviceClass::TestDeviceClass(string &s):DeviceClass(s)
 
 	/*----- PROTECTED REGION END -----*/	//	TestDevice::Class::constructor
 
-	cout2 << "Leaving TestDeviceClass constructor" << endl;
+	TANGO_LOG_INFO << "Leaving TestDeviceClass constructor" << endl;
 }
 
 
@@ -151,7 +151,7 @@ TestDeviceClass *TestDeviceClass::instance()
 //--------------------------------------------------------
 CORBA::Any *WriteAttrnameClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "WriteAttrnameClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "WriteAttrnameClass::execute(): arrived" << endl;
 
 	const Tango::DevVarDoubleStringArray	*argin;
 	extract(in_any, argin);
@@ -172,7 +172,7 @@ CORBA::Any *WriteAttrnameClass::execute(Tango::DeviceImpl *device, const CORBA::
 //--------------------------------------------------------
 CORBA::Any *ReadAttrnameClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "ReadAttrnameClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "ReadAttrnameClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -192,7 +192,7 @@ CORBA::Any *ReadAttrnameClass::execute(Tango::DeviceImpl *device, const CORBA::A
 //--------------------------------------------------------
 CORBA::Any *ConfigClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "ConfigClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "ConfigClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -213,7 +213,7 @@ CORBA::Any *ConfigClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in
 //--------------------------------------------------------
 CORBA::Any *AddClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "AddClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "AddClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -234,7 +234,7 @@ CORBA::Any *AddClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_an
 //--------------------------------------------------------
 CORBA::Any *AddDoubleClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "AddDoubleClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "AddDoubleClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -255,7 +255,7 @@ CORBA::Any *AddDoubleClass::execute(Tango::DeviceImpl *device, const CORBA::Any
 //--------------------------------------------------------
 CORBA::Any *AddLongClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "AddLongClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "AddLongClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -276,7 +276,7 @@ CORBA::Any *AddLongClass::execute(Tango::DeviceImpl *device, const CORBA::Any &i
 //--------------------------------------------------------
 CORBA::Any *AddBoolClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "AddBoolClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "AddBoolClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -297,7 +297,7 @@ CORBA::Any *AddBoolClass::execute(Tango::DeviceImpl *device, const CORBA::Any &i
 //--------------------------------------------------------
 CORBA::Any *AddStringClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "AddStringClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "AddStringClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -318,7 +318,7 @@ CORBA::Any *AddStringClass::execute(Tango::DeviceImpl *device, const CORBA::Any
 //--------------------------------------------------------
 CORBA::Any *RemoveClass::execute(Tango::DeviceImpl *device, const CORBA::Any &in_any)
 {
-	cout2 << "RemoveClass::execute(): arrived" << endl;
+	TANGO_LOG_INFO << "RemoveClass::execute(): arrived" << endl;
 
 	const Tango::DevVarStringArray	*argin;
 	extract(in_any, argin);
@@ -514,7 +514,7 @@ void TestDeviceClass::device_factory(const Tango::DevVarStringArray *devlist_ptr
 	//	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 TestDevice(this, (*devlist_ptr)[i]));
 	}
 
@@ -695,7 +695,7 @@ void TestDeviceClass::create_static_attribute_list(vector<Tango::Attr *> &att_li
 		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(TestDevice::Class::create_static_att_list) ENABLED START -----*/
@@ -733,7 +733,7 @@ void TestDeviceClass::erase_dynamic_attributes(const Tango::DevVarStringArray *d
 			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);
 				--ite_att;

test/testdevice/src/TestDeviceClass.h

@@ -22,15 +22,25 @@
 #ifndef TestDeviceCLASS_H
 #define TestDeviceCLASS_H
 
-#include <tango.h>
+#include <tango/tango.h>
 #include <TestDevice.h>
 
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+#ifndef TANGO_LOG_INFO
+#define TANGO_LOG_INFO cout2
+#endif
+#ifndef TANGO_LOG_DEBUG
+#define TANGO_LOG_DEBUG cout4
+#endif
+
 /*----- PROTECTED REGION END -----*/
 
 namespace TestDevice_ns
 {
 	/*----- PROTECTED REGION ID(TestDevice::classes for dynamic creation) ENABLED START -----*/
-
+    using namespace std;
 	/*----- PROTECTED REGION END -----*/	//	TestDevice::classes for dynamic creation
 
 

test/testdevice/src/main.cpp

@@ -18,11 +18,21 @@
 //        (Program Obviously used to Generate tango Object)
 //=============================================================================
 
-#include <tango.h>
+#include <tango/tango.h>
 
+#ifndef TANGO_LOG
+#define TANGO_LOG cout
+#endif
+#ifndef TANGO_LOG_INFO
+#define TANGO_LOG_INFO cout2
+#endif
+#ifndef TANGO_LOG_DEBUG
+#define TANGO_LOG_DEBUG cout4
+#endif
 
 int main(int argc,char *argv[])
 {
+    using namespace std;
 	Tango::Util *tg = NULL;
 	try
 	{
@@ -37,20 +47,20 @@ int main(int argc,char *argv[])
 
 		// Run the endless loop
 		//----------------------------------------
-		cout << "Ready to accept request" << endl;
+		TANGO_LOG << "Ready to accept request" << endl;
 		tg->server_run();
 	}
 	catch (bad_alloc)
 	{
-		cout << "Can't allocate memory to store device object !!!" << endl;
-		cout << "Exiting" << endl;
+		TANGO_LOG << "Can't allocate memory to store device object !!!" << endl;
+		TANGO_LOG << "Exiting" << endl;
 	}
 	catch (CORBA::Exception &e)
 	{
 		Tango::Except::print_exception(e);
 		
-		cout << "Received a CORBA_Exception" << endl;
-		cout << "Exiting" << endl;
+		TANGO_LOG << "Received a CORBA_Exception" << endl;
+		TANGO_LOG << "Exiting" << endl;
 	}
 	if (tg!=NULL)
 		tg->server_cleanup();