diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:42 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-07-19 22:22:42 +0300 |
| commit | 3a476a8296c78eef1007c6fdca7188e78f9b6280 (patch) | |
| tree | 8f4e061aacccf82813048634d22b760adf7f6fe2 /indra/llcommon/llcoros.h | |
| parent | 8b5fe507a439c73ac22fdd71c4083d42cf351d79 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' into DRTVWR-530-maint
Diffstat (limited to 'indra/llcommon/llcoros.h')
| -rw-r--r-- | indra/llcommon/llcoros.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h index 38c2356c99..6c0bec3ef9 100644 --- a/indra/llcommon/llcoros.h +++ b/indra/llcommon/llcoros.h @@ -290,11 +290,12 @@ public: private: std::string generateDistinctName(const std::string& prefix) const; - void toplevel(std::string name, callable_t callable); - struct CoroData; #if LL_WINDOWS - static void winlevel(const callable_t& callable); + void winlevel(const std::string& name, const callable_t& callable); #endif + void toplevelTryWrapper(const std::string& name, const callable_t& callable); + void toplevel(std::string name, callable_t callable); + struct CoroData; static CoroData& get_CoroData(const std::string& caller); S32 mStackSize; |