Skip to content
Snippets Groups Projects
Commit a5181b23 authored by Graziano Scalamera's avatar Graziano Scalamera Committed by Thomas Juerges
Browse files

Fix Tango 9.3.x compatibility

parent f8bd8dc8
No related branches found
No related tags found
2 merge requests!4Resolve "Update for cppTango 9.5.x",!3Resolve "Add macOS compatibility"
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
...@@ -61,7 +61,15 @@ class update_thread; ...@@ -61,7 +61,15 @@ class update_thread;
# define ELAPSED(before, after) \ # define ELAPSED(before, after) \
1000.0*(after.tv_sec-before.tv_sec) + \ 1000.0*(after.tv_sec-before.tv_sec) + \
((double)after.tv_usec-before.tv_usec) / 1000 ((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 /*----- PROTECTED REGION END -----*/ // AlarmHandler.h
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define _SUBSCRIBE_THREAD_H #define _SUBSCRIBE_THREAD_H
#include <tango/tango.h> #include <tango/tango.h>
#include <tango/client/eventconsumer.h>
#include <stdint.h> #include <stdint.h>
#include "event_table.h" #include "event_table.h"
......
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
#include "AlarmHandler.h" #include "AlarmHandler.h"
#include "alarm_grammar.h" #include "alarm_grammar.h"
//for get_event_system_for_event_id, to know if ZMQ
#include <tango/client/eventconsumer.h>
#include <regex> #include <regex>
static const char __FILE__rev[] = __FILE__ " $Revision: 1.5 $"; static const char __FILE__rev[] = __FILE__ " $Revision: 1.5 $";
......
...@@ -43,6 +43,11 @@ ...@@ -43,6 +43,11 @@
DECLARE_CRASH_HANDLER; DECLARE_CRASH_HANDLER;
#ifndef TANGO_LOG
#define TANGO_LOG cout
#endif
int main(int argc,char *argv[]) int main(int argc,char *argv[])
{ {
using std::endl; using std::endl;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment