From 8beff75dc744fb1005b7fb51a9978da44b95fc4a Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Tue, 1 Dec 2020 08:44:37 +0100
Subject: [PATCH] clean compltation with supervisedid 2.0.0, fix energy switch
procedure
---
deps/supervisedid | 2 +-
src/TwinApuId.cpp | 4 ++--
src/TwinApuIdClass.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/deps/supervisedid b/deps/supervisedid
index 058cc4f..2c5fa6e 160000
--- a/deps/supervisedid
+++ b/deps/supervisedid
@@ -1 +1 @@
-Subproject commit 058cc4f4dce21260bf99a2a795f2a2d8d3095023
+Subproject commit 2c5fa6e4e7672d4dc84b773533062cce1d6ef969
diff --git a/src/TwinApuId.cpp b/src/TwinApuId.cpp
index 57cffe6..5fe3d3f 100644
--- a/src/TwinApuId.cpp
+++ b/src/TwinApuId.cpp
@@ -87,7 +87,7 @@
namespace TwinApuId_ns
{
/*----- PROTECTED REGION ID(TwinApuId::namespace_starting) ENABLED START -----*/
-
+using namespace SupervisedID_ns;
// static initializations
/*----- PROTECTED REGION END -----*/ // TwinApuId::namespace_starting
@@ -609,7 +609,7 @@ void TwinApuId::write_Enabled(Tango::WAttribute &attr)
attr.get_write_value(w_val);
/*----- PROTECTED REGION ID(TwinApuId::write_Enabled) ENABLED START -----*/
- int priv=caller_privileges();
+ privilege priv=caller_privileges();
if (priv < PRIVILEGED){
INFO_STREAM << "Enabled from "<< clientAddress <<" REJECTED"<<endl;
TangoSys_OMemStream o;
diff --git a/src/TwinApuIdClass.cpp b/src/TwinApuIdClass.cpp
index 93d3025..67be788 100644
--- a/src/TwinApuIdClass.cpp
+++ b/src/TwinApuIdClass.cpp
@@ -500,7 +500,7 @@ void TwinApuIdClass::write_class_property()
Tango::DbData data;
string classname = get_name();
string header;
- string::size_type start, end;
+ //string::size_type start, end;
// Put title
Tango::DbDatum title("ProjectTitle");
--
GitLab