Resolve "Update for cppTango 9.5.x"

Closes #2 (closed)

src/AlarmHandler.h

@@ -33,7 +33,7 @@
 #ifndef AlarmHandler_H
 #define AlarmHandler_H
 
-#include <tango.h>
+#include <tango/tango.h>
 
 #include <boost/version.hpp>
 #if BOOST_VERSION  >= 103600
@@ -61,7 +61,15 @@ class update_thread;
 #	define	ELAPSED(before, after)	\
 		1000.0*(after.tv_sec-before.tv_sec) + \
 		((double)after.tv_usec-before.tv_usec) / 1000
-
+#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 -----*/	//	AlarmHandler.h
@@ -585,13 +593,13 @@ private:
 	void init_alarms(map< string,vector<string> > &alarm_events);
 #endif
 	void add_alarm(alarm_t& a, bool starting=false);
-	void add_event(alarm_t& a, vector<string> &evn) throw(string&);
+	void add_event(alarm_t& a, vector<string> &evn);
 #if 0
-	void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn) throw(string&);
+	void subscribe_event(alarm_t& a, EventCallBack& ecb, vector<string> &evn);
 #endif
 //	void do_alarm(bei_t& e);											//gcc 4 problem??
-	bool remove_alarm(string& s) throw(string&);
-	//void add_to_database(alarm_t& a) throw(string&);
+	bool remove_alarm(string& s);
+	//void add_to_database(alarm_t& a);
 	void set_internal_alarm(string name, Tango::TimeVal t, string msg, unsigned int count=1);
 	
 	void load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn);