diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:30:12 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-08-20 06:30:12 +0300 |
| commit | c4e1b801b639c5408ec6e6aae615a4bf1e673efe (patch) | |
| tree | 91dec009c5581dd3115027a5e58a38486927e698 /indra | |
| parent | 3a4720d1f523ca8ebee0d963604c236c08980eae (diff) | |
Post-merge build fix (#2059)
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llexception.cpp | 3 | ||||
| -rw-r--r-- | indra/llcommon/llexception.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llexception.cpp b/indra/llcommon/llexception.cpp index 107fdc2b2d..0a2f2ab607 100644 --- a/indra/llcommon/llexception.cpp +++ b/indra/llcommon/llexception.cpp @@ -18,9 +18,6 @@ #include <iomanip> #include <sstream> #include <typeinfo> -#if LL_WINDOWS -#include <excpt.h> -#endif // LL_WINDOWS // external library headers #include <boost/exception/diagnostic_information.hpp> #include <boost/exception/error_info.hpp> diff --git a/indra/llcommon/llexception.h b/indra/llcommon/llexception.h index f58a553eb3..2a8c18507a 100644 --- a/indra/llcommon/llexception.h +++ b/indra/llcommon/llexception.h @@ -17,6 +17,9 @@ #include <boost/exception/exception.hpp> #include <boost/throw_exception.hpp> #include <boost/current_function.hpp> +#if LL_WINDOWS +#include <excpt.h> +#endif // LL_WINDOWS // "Found someone who can comfort me // But there are always exceptions..." @@ -180,6 +183,8 @@ auto catcher(TRYCODE&& trycode, HANDLER&& handler) std::forward<HANDLER>(handler)); } +[[noreturn]] void rethrow(U32 code, const std::string& stacktrace); + // monadic variant specifies try(), assumes default filter and handler template <typename TRYCODE> auto catcher(TRYCODE&& trycode) @@ -187,8 +192,6 @@ auto catcher(TRYCODE&& trycode) return catcher(std::forward<TRYCODE>(trycode), rethrow); } -[[noreturn]] void rethrow(U32 code, const std::string& stacktrace); - #else // not LL_WINDOWS ----------------------------------------------------- template <typename TRYCODE, typename FILTER, typename HANDLER> |