github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-01-26 12:22:03 +00:00
Code Issues Releases Wiki Activity

move RtimerFd, ReventFd to librtools

Browse Source
This commit is contained in:
wfjm
2019-03-30 08:53:05 +01:00
parent f9faf937b1
commit 9411fe764d
10 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/src/librlink/Makefile
View File

@@ -1,7 +1,8 @@
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
# $Id: Makefile 1125 2019-03-30 07:34:54Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-03-30 1125 1.1.3 drop ReventFd,RtimerFd
# 2019-01-02 1100 1.1.2 drop boost includes and libs
# 2013-02-01 479 1.1.1 use checkpath_cpp.mk
# 2011-07-31 401 1.1 rename realclean->distclean
@@ -32,7 +33,7 @@ OBJ_all += RlinkCrc16.o
OBJ_all += RlinkPacketBuf.o RlinkPacketBufSnd.o RlinkPacketBufRcv.o
OBJ_all += RlinkPort.o RlinkPortFactory.o
OBJ_all += RlinkPortFifo.o RlinkPortTerm.o RlinkPortCuff.o
OBJ_all += RtimerFd.o ReventFd.o ReventLoop.o
OBJ_all += ReventLoop.o
OBJ_all += RlinkServer.o RlinkServerEventLoop.o
#
DEP_all = $(OBJ_all:.o=.dep)

7
tools/src/librlink/RlinkServer.hpp
View File

@@ -1,6 +1,6 @@
// $Id: RlinkServer.hpp 1088 2018-12-17 17:37:00Z mueller $
// $Id: RlinkServer.hpp 1125 2019-03-30 07:34:54Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2013-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -29,7 +29,6 @@
// ---------------------------------------------------------------------------
/*!
\file
\brief Declaration of class \c RlinkServer.
*/
@@ -46,8 +45,8 @@
#include <thread>
#include "librtools/Rstats.hpp"
#include "librtools/ReventFd.hpp"
#include "ReventFd.hpp"
#include "RlinkConnect.hpp"
#include "RlinkContext.hpp"
#include "RlinkServerEventLoop.hpp"

5
tools/src/librtools/Makefile
View File

@@ -1,7 +1,8 @@
# $Id: Makefile 1100 2019-01-02 10:56:47Z mueller $
# $Id: Makefile 1125 2019-03-30 07:34:54Z mueller $
#
# Revision History:
# Date Rev Version Comment
# 2019-03-30 1125 1.1.4 add ReventFd,RtimerFd
# 2019-01-02 1100 1.1.3 drop boost includes and libs
# 2014-11-01 600 1.1.2 add -lboost_system (needed in boost 1.54)
# 2013-02-01 479 1.1.1 use checkpath_cpp.mk
@@ -24,6 +25,7 @@ include ../checkpath_cpp.mk
#
OBJ_all = Rbits.o
OBJ_all += RerrMsg.o
OBJ_all += ReventFd.o
OBJ_all += Rexception.o
OBJ_all += RiosState.o
OBJ_all += RlogFile.o RlogFileCatalog.o RlogMsg.o
@@ -32,6 +34,7 @@ OBJ_all += RosPrintBvi.o RosPrintfBase.o RosPrintfS.o
OBJ_all += RparseUrl.o
OBJ_all += Rstats.o
OBJ_all += Rtime.o
OBJ_all += RtimerFd.o
OBJ_all += Rtools.o
#
DEP_all = $(OBJ_all:.o=.dep)

0
tools/src/librlink/ReventFd.cpp → tools/src/librtools/ReventFd.cpp
View File

0
tools/src/librlink/ReventFd.hpp → tools/src/librtools/ReventFd.hpp
View File

0
tools/src/librlink/ReventFd.ipp → tools/src/librtools/ReventFd.ipp
View File

0
tools/src/librlink/RtimerFd.cpp → tools/src/librtools/RtimerFd.cpp
View File

0
tools/src/librlink/RtimerFd.hpp → tools/src/librtools/RtimerFd.hpp
View File

0
tools/src/librlink/RtimerFd.ipp → tools/src/librtools/RtimerFd.ipp
View File

7
tools/src/librw11/Rw11CntlDEUNA.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rw11CntlDEUNA.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rw11CntlDEUNA.hpp 1125 2019-03-30 07:34:54Z mueller $
//
// Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2014-2019 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -19,7 +19,6 @@
/*!
\file
\brief Declaration of class Rw11CntlDEUNA.
*/
@@ -29,7 +28,7 @@
#include <deque>
#include "librtools/Rtime.hpp"
#include "librlink/RtimerFd.hpp"
#include "librtools/RtimerFd.hpp"
#include "RethBuf.hpp"