cafe/cpp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preparing fro RHEL9

Browse Source
This commit is contained in:
Jan Chrin
2026-07-20 09:33:09 +02:00
parent 3d955b1c98
commit 7f84e06fc2
19 changed files with 2917 additions and 2102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/handleHelper.h
+4 -2
View File
@@ -257,7 +257,8 @@ public:
int status=getTimeStamp(h, ts);
if (status==ICAFE_NORMAL)
{
std::string nsS = static_cast<std::ostringstream*>( &(std::ostringstream() << ts.nsec) )->str();
//std::string nsS = static_cast<std::ostringstream*>( &(std::ostringstream() << ts.nsec) )->str();
std::string nsS = std::to_string(ts.nsec);
int l=nsS.length();
int startPos=std::max(l-6,0);
std::string pidS = nsS.substr(startPos,std::min(6,l));
@@ -269,7 +270,8 @@ public:
unsigned int getPulseIDFromTS(epicsTimeStamp ts)
{
unsigned int pulseID;
std::string nsS = static_cast<std::ostringstream*>( &(std::ostringstream() << ts.nsec) )->str();
//std::string nsS = static_cast<std::ostringstream*>( &(std::ostringstream() << ts.nsec) )->str();
std::string nsS = std::to_string(ts.nsec);
int l=nsS.length();
int startPos=std::max(l-6,0);
std::string pidS = nsS.substr(startPos,std::min(6,l));
include/makefile
+33 -32
View File
@@ -1,7 +1,7 @@
# makefile.in generated by automake 1.16.1 from makefile.am.
# makefile.in generated by automake 1.16.2 from makefile.am.
# include/makefile. Generated from makefile.in by configure.
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -197,24 +197,24 @@ ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing aclocal-1.16
ACLOCAL = ${SHELL} /psi.ch/group/8121/jan/gitea/CAFE/cpp/missing aclocal-1.16
AMTAR = $${TAR-tar}
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
AM_CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.10/include/ -I/usr/local/epics/base-7.0.10/include/os/Linux -I/usr/local/epics/base-7.0.10/include/compiler/gcc -I/psi.ch/project/cafe/bin/boost/boost_1_91_0/boost -I/psi.ch/project/cafe/bin/boost/boost_1_91_0
AM_DEFAULT_VERBOSITY = 1
AM_LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
AM_LDFLAGS = -L/usr/local/epics/base-7.0.10/lib/RHEL9-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.10/lib/RHEL9-x86_64
AR = ar
AUTOCONF = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoconf
AUTOHEADER = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing autoheader
AUTOMAKE = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing automake-1.16
AUTOCONF = ${SHELL} /psi.ch/group/8121/jan/gitea/CAFE/cpp/missing autoconf
AUTOHEADER = ${SHELL} /psi.ch/group/8121/jan/gitea/CAFE/cpp/missing autoheader
AUTOMAKE = ${SHELL} /psi.ch/group/8121/jan/gitea/CAFE/cpp/missing automake-1.16
AWK = gawk
CAFE_CPPFLAGS = -I$(top_srcdir)/include
CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -g -O2
CPP = /opt/psi/Programming/gcc/10.4.0/bin/gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.9/include/ -I/usr/local/epics/base-7.0.9/include/os/Linux -I/usr/local/epics/base-7.0.9/include/compiler/gcc -I/opt/gfa/cafe/boost/boost_1_61_0/include/boost -I/opt/gfa/cafe/boost/boost_1_61_0/include
CXX = /opt/psi/Programming/gcc/10.4.0/bin/g++
CXXCPP = /opt/psi/Programming/gcc/10.4.0/bin/g++ -E
CPP = gcc -E
CPPFLAGS = -fexceptions -fPIC -std=c++1z -z nodefs -I/usr/local/epics/base-7.0.10/include/ -I/usr/local/epics/base-7.0.10/include/os/Linux -I/usr/local/epics/base-7.0.10/include/compiler/gcc -I/psi.ch/project/cafe/bin/boost/boost_1_91_0/boost -I/psi.ch/project/cafe/bin/boost/boost_1_91_0
CXX = g++
CXXCPP = g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
@@ -226,17 +226,17 @@ DUMPBIN =
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
EGREP = /usr/bin/grep -E
EXEEXT =
FGREP = /bin/grep -F
GREP = /bin/grep
INSTALL = /bin/install -c
FGREP = /usr/bin/grep -F
GREP = /usr/bin/grep
INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
LD = /bin/ld -m elf_x86_64
LDFLAGS = -L/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.9/lib/RHEL8-x86_64
LD = /usr/bin/ld -m elf_x86_64
LDFLAGS = -L/usr/local/epics/base-7.0.10/lib/RHEL9-x86_64 -Wl,-rpath,/usr/local/epics/base-7.0.10/lib/RHEL9-x86_64
LIBOBJS =
LIBS =
LIBTOOL = $(SHELL) $(top_builddir)/libtool
@@ -244,10 +244,10 @@ LIPO =
LN_S = ln -s
LTLIBOBJS =
LT_SYS_LIBRARY_PATH =
MAKEINFO = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/missing makeinfo
MAKEINFO = ${SHELL} /psi.ch/group/8121/jan/gitea/CAFE/cpp/missing makeinfo
MANIFEST_TOOL = :
MKDIR_P = /bin/mkdir -p
NM = /bin/nm -B
MKDIR_P = /usr/bin/mkdir -p
NM = /usr/bin/nm -B
NMEDIT =
OBJDUMP = objdump
OBJEXT = o
@@ -262,18 +262,18 @@ PACKAGE_URL =
PACKAGE_VERSION = 1.22.0
PATH_SEPARATOR = :
RANLIB = ranlib
SED = /bin/sed
SED = /usr/bin/sed
SET_MAKE =
SHELL = /bin/sh
STRIP = strip
VERSION = 1.22.0
abs_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
abs_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp/include
abs_top_builddir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_top_srcdir = /afs/psi.ch/project/cafe/gitea/CAFE/cpp
abs_builddir = /psi.ch/group/8121/jan/gitea/CAFE/cpp/include
abs_srcdir = /psi.ch/group/8121/jan/gitea/CAFE/cpp/include
abs_top_builddir = /psi.ch/group/8121/jan/gitea/CAFE/cpp
abs_top_srcdir = /psi.ch/group/8121/jan/gitea/CAFE/cpp
ac_ct_AR = ar
ac_ct_CC = /opt/psi/Programming/gcc/10.4.0/bin/gcc
ac_ct_CXX =
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_DUMPBIN =
am__include = include
am__leading_dot = .
@@ -300,8 +300,8 @@ host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
install_sh = ${SHELL} /afs/psi.ch/project/cafe/gitea/CAFE/cpp/install-sh
libdir = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0/lib/RHEL8-x86_64
install_sh = ${SHELL} /psi.ch/group/8121/jan/gitea/CAFE/cpp/install-sh
libdir = /psi.ch/project/cafe/bin/cpp/cafe-1.22.0-hipa-gcc-11.5.0/lib/RHEL9-x86_64
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
@@ -309,9 +309,10 @@ mandir = ${datarootdir}/man
mkdir_p = $(MKDIR_P)
oldincludedir = /usr/include
pdfdir = ${docdir}
prefix = /opt/gfa/cafe/cpp/cafe-1.22.0-gcc-10.4.0
prefix = /psi.ch/project/cafe/bin/cpp/cafe-1.22.0-hipa-gcc-11.5.0
program_transform_name = s,x,x,
psdir = ${docdir}
runstatedir = ${localstatedir}/run
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
srcdir = .