From 53419d14199e37bbf045b3009867bf31f90e7042 Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Thu, 26 Mar 2020 11:37:03 +0100
Subject: [PATCH] compile on 18.04 x86_64, removed some compiler warnings,
gitlab conventions
---
Makefile | 6 ++---
.../accessconf_bsh_diproi.txt | 0
.../accessconf_bsh_eehg.txt | 0
.../accessconf_bsh_fel01.txt | 0
.../accessconf_bsh_fel02.txt | 0
.../accessconf_bsh_ldm.txt | 0
.../accessconf_bsh_lsu.txt | 0
.../accessconf_bsh_slu.txt | 0
.../accessconf_bsh_timex.txt | 0
.../accessconf_laser_pss.txt | 0
.../accessconf_pumps.txt | 0
.../accessconf_vlvp_eh_01.txt | 0
.../accessconf_vlvp_eh_02.txt | 0
.../accessconf_vlvp_sh_01.txt | 0
.../accessconf_vlvp_uh_01.txt | 0
.../accessconf_vlvp_uh_02.txt | 0
.../accessconf_vlvp_uh_03.txt | 0
.../laser-pss-Attr-config-prop.txt | 0
src/AccessConf.cpp | 25 +++++++++----------
src/AccessConfClass.cpp | 1 -
src/AccessConfStateMachine.cpp | 1 -
src/ClassFactory.cpp | 1 -
src/main.cpp | 1 -
23 files changed, 15 insertions(+), 20 deletions(-)
rename accessconf_bsh_diproi.txt => docs/accessconf_bsh_diproi.txt (100%)
rename accessconf_bsh_eehg.txt => docs/accessconf_bsh_eehg.txt (100%)
rename accessconf_bsh_fel01.txt => docs/accessconf_bsh_fel01.txt (100%)
rename accessconf_bsh_fel02.txt => docs/accessconf_bsh_fel02.txt (100%)
rename accessconf_bsh_ldm.txt => docs/accessconf_bsh_ldm.txt (100%)
rename accessconf_bsh_lsu.txt => docs/accessconf_bsh_lsu.txt (100%)
rename accessconf_bsh_slu.txt => docs/accessconf_bsh_slu.txt (100%)
rename accessconf_bsh_timex.txt => docs/accessconf_bsh_timex.txt (100%)
rename accessconf_laser_pss.txt => docs/accessconf_laser_pss.txt (100%)
rename accessconf_pumps.txt => docs/accessconf_pumps.txt (100%)
rename accessconf_vlvp_eh_01.txt => docs/accessconf_vlvp_eh_01.txt (100%)
rename accessconf_vlvp_eh_02.txt => docs/accessconf_vlvp_eh_02.txt (100%)
rename accessconf_vlvp_sh_01.txt => docs/accessconf_vlvp_sh_01.txt (100%)
rename accessconf_vlvp_uh_01.txt => docs/accessconf_vlvp_uh_01.txt (100%)
rename accessconf_vlvp_uh_02.txt => docs/accessconf_vlvp_uh_02.txt (100%)
rename accessconf_vlvp_uh_03.txt => docs/accessconf_vlvp_uh_03.txt (100%)
rename laser-pss-Attr-config-prop.txt => docs/laser-pss-Attr-config-prop.txt (100%)
diff --git a/Makefile b/Makefile
index 033ff94..c91d30c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-NAME_SRV = accessconf-srv
+NAME_SRV = access-conf-srv
-CXXFLAGS = -DRELEASE='"N$Name: $ "'
+CXXFLAGS = -DRELEASE='"1.0.0"'
LDFLAGS =
-include ../Make.in
+include ../makefiles/Make-9.3.3.in
diff --git a/accessconf_bsh_diproi.txt b/docs/accessconf_bsh_diproi.txt
similarity index 100%
rename from accessconf_bsh_diproi.txt
rename to docs/accessconf_bsh_diproi.txt
diff --git a/accessconf_bsh_eehg.txt b/docs/accessconf_bsh_eehg.txt
similarity index 100%
rename from accessconf_bsh_eehg.txt
rename to docs/accessconf_bsh_eehg.txt
diff --git a/accessconf_bsh_fel01.txt b/docs/accessconf_bsh_fel01.txt
similarity index 100%
rename from accessconf_bsh_fel01.txt
rename to docs/accessconf_bsh_fel01.txt
diff --git a/accessconf_bsh_fel02.txt b/docs/accessconf_bsh_fel02.txt
similarity index 100%
rename from accessconf_bsh_fel02.txt
rename to docs/accessconf_bsh_fel02.txt
diff --git a/accessconf_bsh_ldm.txt b/docs/accessconf_bsh_ldm.txt
similarity index 100%
rename from accessconf_bsh_ldm.txt
rename to docs/accessconf_bsh_ldm.txt
diff --git a/accessconf_bsh_lsu.txt b/docs/accessconf_bsh_lsu.txt
similarity index 100%
rename from accessconf_bsh_lsu.txt
rename to docs/accessconf_bsh_lsu.txt
diff --git a/accessconf_bsh_slu.txt b/docs/accessconf_bsh_slu.txt
similarity index 100%
rename from accessconf_bsh_slu.txt
rename to docs/accessconf_bsh_slu.txt
diff --git a/accessconf_bsh_timex.txt b/docs/accessconf_bsh_timex.txt
similarity index 100%
rename from accessconf_bsh_timex.txt
rename to docs/accessconf_bsh_timex.txt
diff --git a/accessconf_laser_pss.txt b/docs/accessconf_laser_pss.txt
similarity index 100%
rename from accessconf_laser_pss.txt
rename to docs/accessconf_laser_pss.txt
diff --git a/accessconf_pumps.txt b/docs/accessconf_pumps.txt
similarity index 100%
rename from accessconf_pumps.txt
rename to docs/accessconf_pumps.txt
diff --git a/accessconf_vlvp_eh_01.txt b/docs/accessconf_vlvp_eh_01.txt
similarity index 100%
rename from accessconf_vlvp_eh_01.txt
rename to docs/accessconf_vlvp_eh_01.txt
diff --git a/accessconf_vlvp_eh_02.txt b/docs/accessconf_vlvp_eh_02.txt
similarity index 100%
rename from accessconf_vlvp_eh_02.txt
rename to docs/accessconf_vlvp_eh_02.txt
diff --git a/accessconf_vlvp_sh_01.txt b/docs/accessconf_vlvp_sh_01.txt
similarity index 100%
rename from accessconf_vlvp_sh_01.txt
rename to docs/accessconf_vlvp_sh_01.txt
diff --git a/accessconf_vlvp_uh_01.txt b/docs/accessconf_vlvp_uh_01.txt
similarity index 100%
rename from accessconf_vlvp_uh_01.txt
rename to docs/accessconf_vlvp_uh_01.txt
diff --git a/accessconf_vlvp_uh_02.txt b/docs/accessconf_vlvp_uh_02.txt
similarity index 100%
rename from accessconf_vlvp_uh_02.txt
rename to docs/accessconf_vlvp_uh_02.txt
diff --git a/accessconf_vlvp_uh_03.txt b/docs/accessconf_vlvp_uh_03.txt
similarity index 100%
rename from accessconf_vlvp_uh_03.txt
rename to docs/accessconf_vlvp_uh_03.txt
diff --git a/laser-pss-Attr-config-prop.txt b/docs/laser-pss-Attr-config-prop.txt
similarity index 100%
rename from laser-pss-Attr-config-prop.txt
rename to docs/laser-pss-Attr-config-prop.txt
diff --git a/src/AccessConf.cpp b/src/AccessConf.cpp
index 3fc7a9c..3876036 100644
--- a/src/AccessConf.cpp
+++ b/src/AccessConf.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(AccessConf.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: AccessConf.cpp,v 1.18 2019-11-06 08:28:04 graziano Exp $";
//=============================================================================
//
// file : AccessConf.cpp
@@ -116,7 +115,7 @@ namespace AccessConf_ns
/*----- PROTECTED REGION ID(AccessConf::namespace_starting) ENABLED START -----*/
// static initializations
-bool compare_attr_index (attr_desc_t i,attr_desc_t j) { return (i.attr_index < j.attr_index); };
+bool compare_attr_index (attr_desc_t i,attr_desc_t j) { return (i.attr_index < j.attr_index); }
/*----- PROTECTED REGION END -----*/ // AccessConf::namespace_starting
@@ -1984,7 +1983,7 @@ CORBA::Any *CmdClass::execute(Tango::DeviceImpl *device,const CORBA::Any &in_any
vector<string>::iterator si;
if(str.size() != 2)
{
- cout << "CmdClass::" << get_name() << ": bad argin number" << endl;
+ cerr << "CmdClass::" << get_name() << ": bad argin number" << endl;
Tango::Except::throw_exception( \
(const char*)"Invalid parameters", \
(const char*)"Invalid parameters", \
@@ -1993,7 +1992,7 @@ CORBA::Any *CmdClass::execute(Tango::DeviceImpl *device,const CORBA::Any &in_any
}
if(str.at(1) != f->second.pass)
{
- cout << "CmdClass::" << get_name() << ": bad pass="<<str.at(1) << endl;
+ cerr << "CmdClass::" << get_name() << ": bad pass="<<str.at(1) << endl;
Tango::Except::throw_exception( \
(const char*)"Invalid parameters", \
(const char*)"Invalid parameters", \
@@ -2100,7 +2099,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
// Check if event is an error event.
if (ev->err)
{
- cout<< __func__ << ": Exception on " << ev->attr_name << " err=" << ev->errors[0].desc << endl;
+ cerr << __func__ << ": Exception on " << ev->attr_name << " err=" << ev->errors[0].desc << endl;
return;
}
//find event
@@ -2169,7 +2168,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
ostringstream o;
o << "find_events(): event '" \
<< event_name << "' not found!" << ends;
- cout <<__func__<< ": " << o.str() << endl;
+ cerr <<__func__<< ": " << o.str() << endl;
return;
}
}
@@ -2252,7 +2251,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
//(static_cast<AccessConf *>(mydevice))->push_change_event("status");
} catch(Tango::DevFailed &e)
{
- cout << __func__<<": error pushing state="<<e.errors[0].desc<<endl;
+ cerr << __func__<<": error pushing state="<<e.errors[0].desc<<endl;
}
// if(!valve_stat[2]){
// set_status("pressure not ok");
@@ -2275,7 +2274,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
//(static_cast<AccessConf *>(mydevice))->push_change_event("status");
} catch(Tango::DevFailed &e)
{
- cout << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
+ cerr << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
}
}
else
@@ -2292,7 +2291,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
//(static_cast<AccessConf *>(mydevice))->push_change_event("status");
} catch(Tango::DevFailed &e)
{
- cout << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
+ cerr << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
}
}
}
@@ -2312,7 +2311,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
//(static_cast<AccessConf *>(mydevice))->push_change_event("status");
} catch(Tango::DevFailed &e)
{
- cout << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
+ cerr << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
}
}
else
@@ -2329,7 +2328,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
//(static_cast<AccessConf *>(mydevice))->push_change_event("status");
} catch(Tango::DevFailed &e)
{
- cout << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
+ cerr << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
}
}
}
@@ -2346,7 +2345,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
//(static_cast<AccessConf *>(mydevice))->push_change_event("status", (static_cast<AccessConf *>(mydevice))->attr_status_read, 1, 0, false);
} catch(Tango::DevFailed &e)
{
- cout << __func__ <<" error pushing status="<<e.errors[0].desc<<endl;
+ cerr << __func__ <<" error pushing status="<<e.errors[0].desc<<endl;
}
}
}
@@ -2360,7 +2359,7 @@ void EventCallBack::push_event(Tango::EventData* ev)
(static_cast<AccessConf *>(mydevice))->push_archive_event(*it_loc_attr,&(it_val->second.val[0]), it_data->second.size());
} catch(Tango::DevFailed &e)
{
- cout << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
+ cerr << __func__ <<" error pushing state="<<e.errors[0].desc<<endl;
}
/*else if string
(static_cast<AccessConf *>(mydevice))->push_change_event(*it_loc_attr,(static_cast<AccessConf *>(mydevice))->attr_StringSpectrumDyn_read, it_data->second.size());
diff --git a/src/AccessConfClass.cpp b/src/AccessConfClass.cpp
index 08d4e78..9ed81bd 100644
--- a/src/AccessConfClass.cpp
+++ b/src/AccessConfClass.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(AccessConfClass.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: AccessConfClass.cpp,v 1.2 2019-11-06 08:23:36 graziano Exp $";
static const char *TagName = "$Name: $";
static const char *CvsPath = "$Source: /home/cvsadm/cvsroot/fermi/servers/accessconf/src/AccessConfClass.cpp,v $";
static const char *SvnPath = "$HeadURL: $";
diff --git a/src/AccessConfStateMachine.cpp b/src/AccessConfStateMachine.cpp
index 554932f..b78a71a 100644
--- a/src/AccessConfStateMachine.cpp
+++ b/src/AccessConfStateMachine.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(AccessConfStateMachine.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: AccessConfStateMachine.cpp,v 1.1 2012-10-30 09:29:15 graziano Exp $";
//=============================================================================
//
// file : AccessConfStateMachine.cpp
diff --git a/src/ClassFactory.cpp b/src/ClassFactory.cpp
index 728122a..682be07 100644
--- a/src/ClassFactory.cpp
+++ b/src/ClassFactory.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(AccessConf::ClassFactory.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: ClassFactory.cpp,v 1.1 2012-10-30 09:29:15 graziano Exp $";
//=============================================================================
//
// file : ClassFactory.cpp
diff --git a/src/main.cpp b/src/main.cpp
index c5314d3..1496428 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,4 @@
/*PROTECTED REGION ID(AccessConf::main.cpp) ENABLED START*/
-static const char *RcsId = "$Id: main.cpp,v 1.1 2012-10-30 09:29:15 graziano Exp $";
//=============================================================================
//
// file : AccessConf.cpp
--
GitLab