From 3452e68e0cb96c8afcbd80aa769279639cf9b54e Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 14 Sep 2024 14:05:16 -0500 Subject: [PATCH] xo-simulator: bugfix: xo::ref::rp -> xo::rp --- include/xo/simulator/Simulator.hpp | 14 +++++++------- src/simulator/Simulator.cpp | 2 +- src/simulator/SourceTimestamp.cpp | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/xo/simulator/Simulator.hpp b/include/xo/simulator/Simulator.hpp index d7a0baa1..da87b555 100644 --- a/include/xo/simulator/Simulator.hpp +++ b/include/xo/simulator/Simulator.hpp @@ -24,23 +24,23 @@ namespace xo { public: ReentrantSimulatorCmd() = default; ReentrantSimulatorCmd(SimulatorCmdEnum cmd, - ref::rp const & src) + rp const & src) : cmd_{cmd}, src_{src} {} - static ReentrantSimulatorCmd notify_source_primed(ref::rp const & src) { + static ReentrantSimulatorCmd notify_source_primed(rp const & src) { return ReentrantSimulatorCmd(NotifySourcePrimed, src); } - static ReentrantSimulatorCmd complete_add_source(ref::rp const & src) { + static ReentrantSimulatorCmd complete_add_source(rp const & src) { return ReentrantSimulatorCmd(CompleteAddSource, src); } - static ReentrantSimulatorCmd complete_remove_source(ref::rp const & src) { + static ReentrantSimulatorCmd complete_remove_source(rp const & src) { return ReentrantSimulatorCmd(CompleteRemoveSource, src); } SimulatorCmdEnum cmd() const { return cmd_; } - ref::rp const & src() const { return src_; } + rp const & src() const { return src_; } private: /* NotifySourcePrimed: deferred Simulator.notify_source_primed(.src) @@ -49,7 +49,7 @@ namespace xo { */ SimulatorCmdEnum cmd_ = NotifySourcePrimed; /* if .cmd=NotifySourcePrimed|CompleteAddSource|CompleteRemoveSource: reactor source */ - ref::rp src_; + rp src_; }; /*ReentrantSimulatorCmd*/ /* Generic simulator @@ -74,7 +74,7 @@ namespace xo { public: ~Simulator(); - static ref::rp make(utc_nanos t0); + static rp make(utc_nanos t0); /* value of .t0() is estabished in ctor. * it will not change except across call to .advance_one() diff --git a/src/simulator/Simulator.cpp b/src/simulator/Simulator.cpp index 9835b1ed..3d64c1b4 100644 --- a/src/simulator/Simulator.cpp +++ b/src/simulator/Simulator.cpp @@ -30,7 +30,7 @@ namespace xo { Simulator * sim_ = nullptr; }; /*RaiiDeliveryWork*/ - ref::rp + rp Simulator::make(utc_nanos t0) { return new Simulator(t0); } /*make*/ diff --git a/src/simulator/SourceTimestamp.cpp b/src/simulator/SourceTimestamp.cpp index c3dca025..f425beeb 100644 --- a/src/simulator/SourceTimestamp.cpp +++ b/src/simulator/SourceTimestamp.cpp @@ -17,7 +17,7 @@ namespace xo { { os << "(src_)); + os << xtag("src", rp(src_)); os << ">"; } /*display*/