diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-02 18:37:47 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-02 18:37:47 +0300 |
| commit | 0a342cfe7cc92cdfe308bc75753750c99b0327e6 (patch) | |
| tree | fffe7e213636edcd5e04f276e98f086208ac6510 /indra/llcommon | |
| parent | 3b13c0ca15e2bc413731b0be07db6446bb32df1b (diff) | |
| parent | 364516e8bc19f6435fd42893809080d4f64a3232 (diff) | |
Merge branch 'xcode-14.3' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/llcommon/tests/llsdserialize_test.cpp
# indra/newview/llmeshrepository.cpp
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/stdtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/stdtypes.h b/indra/llcommon/stdtypes.h index da8512169c..0b43d7ad4b 100644 --- a/indra/llcommon/stdtypes.h +++ b/indra/llcommon/stdtypes.h @@ -41,7 +41,7 @@ typedef unsigned int U32; // to express an index that might go negative // (ssize_t is provided by SOME compilers, don't collide) -typedef typename std::make_signed<size_t>::type llssize; +typedef typename std::make_signed<std::size_t>::type llssize; #if LL_WINDOWS // https://docs.microsoft.com/en-us/cpp/build/reference/zc-wchar-t-wchar-t-is-native-type |