diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2020-04-02 10:55:31 -0700 |
|---|---|---|
| committer | euclid <euclid@Euclid-MBP-2019.local> | 2020-05-04 12:11:57 -0600 |
| commit | 2c651f3e21c5eeb0cc361e7b03dcb507c96593d8 (patch) | |
| tree | abc3fab8ae71f0dc8f1d909fb19f943333868d24 | |
| parent | 2df08951e102c05335ce4143fe436b40cc34d22a (diff) | |
Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4
| -rw-r--r-- | indra/llcommon/llsdutil.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llcommandhandler.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llsdutil.cpp b/indra/llcommon/llsdutil.cpp index 6a23c443a0..1f8384f415 100644 --- a/indra/llcommon/llsdutil.cpp +++ b/indra/llcommon/llsdutil.cpp @@ -506,7 +506,7 @@ struct Data const char* name; } typedata[] = { -#define def(type) { LLSD::type, #type + 4 } +#define def(type) { LLSD::type, &#type[4] } def(TypeUndefined), def(TypeBoolean), def(TypeInteger), diff --git a/indra/newview/llcommandhandler.cpp b/indra/newview/llcommandhandler.cpp index 76d965b1f1..23e2271eae 100644 --- a/indra/newview/llcommandhandler.cpp +++ b/indra/newview/llcommandhandler.cpp @@ -222,7 +222,7 @@ struct symbol_info #define ent(SYMBOL) \ { \ - #SYMBOL + 28, /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ + &#SYMBOL[28], /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ SYMBOL \ } diff --git a/indra/newview/llxmlrpclistener.cpp b/indra/newview/llxmlrpclistener.cpp index 0693d08dfb..0daf3e761d 100644 --- a/indra/newview/llxmlrpclistener.cpp +++ b/indra/newview/llxmlrpclistener.cpp @@ -100,7 +100,7 @@ public: { // from curl.h // skip the "CURLE_" prefix for each of these strings -#define def(sym) (mMap[sym] = #sym + 6) +#define def(sym) (mMap[sym] = &#sym[6]) def(CURLE_OK); def(CURLE_UNSUPPORTED_PROTOCOL); /* 1 */ def(CURLE_FAILED_INIT); /* 2 */ |