From fc499d8224d5443d6737f42e86c17e73e037005b Mon Sep 17 00:00:00 2001 From: Giulio Gaio <giulio.gaio@elettra.eu> Date: Fri, 3 Apr 2020 12:23:18 +0200 Subject: [PATCH] Porting to Tango 9.3.3 --- Makefile | 2 +- src/MpsDcct.cpp | 6 +++--- src/MpsDcct.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 94db509..d64ae99 100644 --- a/Makefile +++ b/Makefile @@ -3,4 +3,4 @@ NAME_SRV = mpsdcct-srv CXXFLAGS = LDFLAGS = -lmps -lbufferrt -lrnm -lrnmshare -include ../makefiles/Make-8.1.2.c.in +include ../makefiles/Make-9.3.3.in diff --git a/src/MpsDcct.cpp b/src/MpsDcct.cpp index e076150..457b1a0 100644 --- a/src/MpsDcct.cpp +++ b/src/MpsDcct.cpp @@ -93,19 +93,19 @@ namespace MpsDcct_ns // //----------------------------------------------------------------------------- MpsDcct::MpsDcct(Tango::DeviceClass *cl,string &s) -:Tango::Device_4Impl(cl,s.c_str()) +:TANGO_BASE_CLASS(cl,s.c_str()) { init_device(); } MpsDcct::MpsDcct(Tango::DeviceClass *cl,const char *s) -:Tango::Device_4Impl(cl,s) +:TANGO_BASE_CLASS(cl,s) { init_device(); } MpsDcct::MpsDcct(Tango::DeviceClass *cl,const char *s,const char *d) -:Tango::Device_4Impl(cl,s,d) +:TANGO_BASE_CLASS(cl,s,d) { init_device(); } diff --git a/src/MpsDcct.h b/src/MpsDcct.h index 04ea831..fc77a27 100644 --- a/src/MpsDcct.h +++ b/src/MpsDcct.h @@ -82,7 +82,7 @@ namespace MpsDcct_ns */ -class MpsDcct: public Tango::Device_4Impl +class MpsDcct: public TANGO_BASE_CLASS { public : // Add your own data members here -- GitLab