diff --git a/deps/supervisedid b/deps/supervisedid index 058cc4f4dce21260bf99a2a795f2a2d8d3095023..2c5fa6e4e7672d4dc84b773533062cce1d6ef969 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 57cffe66399630fd82abd00b2bff3e349fb0a9a1..5fe3d3fe8cf1903d533f4cf486314615761be826 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 93d30253a03d13c4a5c2fca1ac994b9cb5119219..67be78848c3f68e495acc3620cfadbd5c404ef0c 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");