From 427b337c604c4a560c83ff4d67c7f46e2d7317e7 Mon Sep 17 00:00:00 2001
From: Claudio Scafuri <claudio.scafuri@elettra.eu>
Date: Thu, 23 Apr 2020 12:11:32 +0200
Subject: [PATCH] compiles on 18.04 x86_64
---
Makefile | 2 +-
src/ClassFactory.cpp | 1 -
src/IonpumpClass.cpp | 4 ++--
src/IonpumpStateMachine.cpp | 1 -
src/main.cpp | 1 -
5 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index c47af5a..be5c8af 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ NAME_SRV = ionpump-srv
CXXFLAGS =
LDFLAGS =
-include ../Make.in
+include ../makefiles/Make-9.3.3.in
test: bin/${NAME_SRV}
LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(SDKTARGETSYSROOT)/usr/lib $(LOADER) bin/${NAME_SRV} test -v4
diff --git a/src/ClassFactory.cpp b/src/ClassFactory.cpp
index 027f14f..5809796 100644
--- a/src/ClassFactory.cpp
+++ b/src/ClassFactory.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(Ionpump::ClassFactory.cpp) ENABLED START -----*/
-static const char *RcsId = "$Header: /home/cvsadm/cvsroot/fermi/servers/ionpump/src/ClassFactory.cpp,v 1.2 2014-10-13 10:15:01 alessio Exp $";
//+=============================================================================
//
// file : ClassFactory.cpp
diff --git a/src/IonpumpClass.cpp b/src/IonpumpClass.cpp
index 5911732..6b72426 100644
--- a/src/IonpumpClass.cpp
+++ b/src/IonpumpClass.cpp
@@ -1,6 +1,6 @@
/*----- PROTECTED REGION ID(IonpumpClass.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: IonpumpClass.cpp,v 1.4 2017-06-14 11:48:04 alessio Exp $";
-static const char *TagName = "Ionpump $Name: $";
+//static const char *RcsId = "$Id: IonpumpClass.cpp,v 1.4 2017-06-14 11:48:04 alessio Exp $";
+static const char *TagName = "1.0.1";
static const char *CvsPath = "$Source: /home/cvsadm/cvsroot/fermi/servers/ionpump/src/IonpumpClass.cpp,v $";
static const char *SvnPath = "$HeadURL: $";
static const char *HttpServer = "http://www.esrf.eu/computing/cs/tango/tango_doc/ds_doc/";
diff --git a/src/IonpumpStateMachine.cpp b/src/IonpumpStateMachine.cpp
index 952d9b5..db2334b 100644
--- a/src/IonpumpStateMachine.cpp
+++ b/src/IonpumpStateMachine.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(IonpumpStateMachine.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: IonpumpStateMachine.cpp,v 1.2 2014-10-13 10:15:01 alessio Exp $";
//=============================================================================
//
// file : IonpumpStateMachine.cpp
diff --git a/src/main.cpp b/src/main.cpp
index 3b19539..7e2e4c3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,4 @@
/*----- PROTECTED REGION ID(Ionpump::main.cpp) ENABLED START -----*/
-static const char *RcsId = "$Id: main.cpp,v 1.2 2014-10-13 10:15:01 alessio Exp $";
//=============================================================================
//
// file : main.cpp
--
GitLab