diff options
| author | Andrey Lihatskiy <118752495+marchcat@users.noreply.github.com> | 2026-01-20 18:49:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-20 18:49:25 +0200 |
| commit | b4f75c4cd53192573e8245eb5fe63a65734d0a1b (patch) | |
| tree | c91ced079bd5b84eb5cd3c7a9c3b3b7bb8367057 /indra/llcorehttp | |
| parent | 7d616292ad664472ffa79cc0cd447096a18e72ba (diff) | |
| parent | 30e7621140a3cbf4c911f596c1325f4b7eae25a6 (diff) | |
Merge pull request #5303 from secondlife/marchcat/slua-ed-dev-lnx
Merge develop-linux into SLua editor PV branch
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/httpcommon.cpp | 4 | ||||
| -rw-r--r-- | indra/llcorehttp/httpcommon.h | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llcorehttp/llhttpconstants.cpp | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llcorehttp/llhttpconstants.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | indra/llcorehttp/tests/llcorehttp_test.cpp | 0 |
5 files changed, 3 insertions, 7 deletions
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp index 315ff15ebb..dabc61975d 100644 --- a/indra/llcorehttp/httpcommon.cpp +++ b/indra/llcorehttp/httpcommon.cpp @@ -36,10 +36,6 @@ namespace LLCore { -HttpStatus::type_enum_t EXT_CURL_EASY; -HttpStatus::type_enum_t EXT_CURL_MULTI; -HttpStatus::type_enum_t LLCORE; - HttpStatus::operator U32() const { // Effectively, concatenate mType (high) with mStatus (low). diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h index 1c003a0966..001fd08f93 100644 --- a/indra/llcorehttp/httpcommon.h +++ b/indra/llcorehttp/httpcommon.h @@ -340,9 +340,9 @@ struct HttpStatus return *this; } - static const type_enum_t EXT_CURL_EASY = 0; ///< mStatus is an error from a curl_easy_*() call - static const type_enum_t EXT_CURL_MULTI = 1; ///< mStatus is an error from a curl_multi_*() call - static const type_enum_t LLCORE = 2; ///< mStatus is an HE_* error code + static constexpr type_enum_t EXT_CURL_EASY = 0; ///< mStatus is an error from a curl_easy_*() call + static constexpr type_enum_t EXT_CURL_MULTI = 1; ///< mStatus is an error from a curl_multi_*() call + static constexpr type_enum_t LLCORE = 2; ///< mStatus is an HE_* error code ///< 100-999 directly represent HTTP status codes /// Test for successful status in the code regardless /// of error source (internal, libcurl). diff --git a/indra/llcorehttp/llhttpconstants.cpp b/indra/llcorehttp/llhttpconstants.cpp index 7a671543d9..7a671543d9 100755..100644 --- a/indra/llcorehttp/llhttpconstants.cpp +++ b/indra/llcorehttp/llhttpconstants.cpp diff --git a/indra/llcorehttp/llhttpconstants.h b/indra/llcorehttp/llhttpconstants.h index d05d0f1af1..d05d0f1af1 100755..100644 --- a/indra/llcorehttp/llhttpconstants.h +++ b/indra/llcorehttp/llhttpconstants.h diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp index c7c50e6166..c7c50e6166 100755..100644 --- a/indra/llcorehttp/tests/llcorehttp_test.cpp +++ b/indra/llcorehttp/tests/llcorehttp_test.cpp |