diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-02-14 17:06:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-14 17:06:40 +0200 |
| commit | bf8a9e8bd28eb7409da0df1fe2996e8c8b8dc7d4 (patch) | |
| tree | 4af37f1d8dd578ca23dbf9009c78feab8179c009 /indra/llcommon | |
| parent | 23ac8f603ea2e590b47598edf0fd6824f168fc0b (diff) | |
| parent | a0e31b1c80bdc6553e7170886ead1c394114eb25 (diff) | |
Merge pull request #3560 from secondlife/marchcat/lua_editor
Lua editor: mac build fix
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/fsyspath.h | 6 | ||||
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/indra/llcommon/fsyspath.h b/indra/llcommon/fsyspath.h index 1b4aec09b4..e9c96edce3 100644 --- a/indra/llcommon/fsyspath.h +++ b/indra/llcommon/fsyspath.h @@ -68,7 +68,11 @@ public: } // shadow base-class string() method with UTF-8 aware method - std::string string() const { return super::u8string(); } + std::string string() const + { + auto u8 = super::u8string(); + return std::string(u8.begin(), u8.end()); + } // On Posix systems, where value_type is already char, this operator // std::string() method shadows the base class operator string_type() // method. But on Windows, where value_type is wchar_t, the base class diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 1c4ac5a7bf..0196a24b18 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -146,7 +146,7 @@ size_t LLQueuedThread::updateQueue(F32 max_time_ms) // schedule a call to threadedUpdate for every call to updateQueue if (!isQuitting()) { - mRequestQueue.post([=]() + mRequestQueue.post([=, this]() { LL_PROFILE_ZONE_NAMED_CATEGORY_THREAD("qt - update"); mIdleThread = false; @@ -474,7 +474,7 @@ void LLQueuedThread::processRequest(LLQueuedThread::QueuedRequest* req) #else using namespace std::chrono_literals; auto retry_time = LL::WorkQueue::TimePoint::clock::now() + 16ms; - mRequestQueue.post([=] + mRequestQueue.post([=, this] { LL_PROFILE_ZONE_NAMED("processRequest - retry"); if (LL::WorkQueue::TimePoint::clock::now() < retry_time) |