summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-09-05 13:41:41 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-09-05 13:41:41 -0400
commit25a86618002a397d1d8dabf2ec1f093489b2f816 (patch)
tree4124bf8c30cdd6cdc55d4871a154542757cf4074 /indra/llcommon
parent953f7c9c1da4b83cabbf91f281445c3704a2f229 (diff)
Fix Windows build errors from develop => release/luau-scripting.
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/coro_scheduler.cpp4
-rw-r--r--indra/llcommon/coro_scheduler.h8
-rw-r--r--indra/llcommon/llcallbacklist.cpp6
3 files changed, 9 insertions, 9 deletions
diff --git a/indra/llcommon/coro_scheduler.cpp b/indra/llcommon/coro_scheduler.cpp
index 393356a39b..02b9f11333 100644
--- a/indra/llcommon/coro_scheduler.cpp
+++ b/indra/llcommon/coro_scheduler.cpp
@@ -26,7 +26,7 @@
namespace llcoro
{
-const F32 scheduler::DEFAULT_TIMESLICE{ LL::Timers::DEFAULT_TIMESLICE };
+const F64 scheduler::DEFAULT_TIMESLICE{ LL::Timers::DEFAULT_TIMESLICE };
const std::string qname("General");
@@ -72,7 +72,7 @@ boost::fibers::context* scheduler::pick_next() noexcept
// When the main fiber is ready, and it's been more than mTimeslice since
// the main fiber last ran, it's time to intervene.
- F32 elapsed(now - mMainLast);
+ F64 elapsed(now - mMainLast);
if (mMainCtx && elapsed > mTimeslice)
{
// We claim that the main fiber is not only stored in mMainCtx, but is
diff --git a/indra/llcommon/coro_scheduler.h b/indra/llcommon/coro_scheduler.h
index cc7e75d798..eee2d746b5 100644
--- a/indra/llcommon/coro_scheduler.h
+++ b/indra/llcommon/coro_scheduler.h
@@ -38,7 +38,7 @@ class scheduler: public boost::fibers::algo::round_robin
public:
// If the main fiber is ready, and it's been at least this long since the
// main fiber last ran, jump the main fiber to the head of the queue.
- static const F32 DEFAULT_TIMESLICE;
+ static const F64 DEFAULT_TIMESLICE;
scheduler();
void awakened( boost::fibers::context*) noexcept override;
@@ -57,11 +57,11 @@ private:
bool mMainRunning{ false };
// If it's been at least this long since the last time the main fiber got
// control, jump it to the head of the queue.
- F32 mTimeslice{ DEFAULT_TIMESLICE };
+ F64 mTimeslice{ DEFAULT_TIMESLICE };
// Timestamp as of the last time we suspended the main fiber.
- F32 mMainLast{ 0 };
+ F64 mMainLast{ 0 };
// Timestamp of start time
- F32 mStart{ 0 };
+ F64 mStart{ 0 };
// count context switches
U64 mSwitches{ 0 };
// WorkQueue for deferred logging
diff --git a/indra/llcommon/llcallbacklist.cpp b/indra/llcommon/llcallbacklist.cpp
index 7cbe7a8c02..7b05c25c21 100644
--- a/indra/llcommon/llcallbacklist.cpp
+++ b/indra/llcommon/llcallbacklist.cpp
@@ -205,7 +205,7 @@ F32 Timers::timeUntilCall(handle_t timer) const
}
else
{
- return found->second.mTime - now();
+ return narrow(found->second.mTime - now());
}
}
@@ -436,7 +436,7 @@ void TimersListener::scheduleAfter(const LLSD& params)
// ditch mHandles entry
mHandles.erase(key);
},
- after));
+ narrow(after)));
}
void TimersListener::scheduleEvery(const LLSD& params)
@@ -461,7 +461,7 @@ void TimersListener::scheduleEvery(const LLSD& params)
// we can't use a handshake -- always keep the ball rolling
return false;
},
- every));
+ narrow(every)));
}
LLSD TimersListener::cancel(const LLSD& params)