diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2020-04-02 10:55:31 -0700 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-14 19:53:57 +0300 |
| commit | bbee0658c3a7837e47d171dacfda55cac803e3ed (patch) | |
| tree | 996595000cefaa0b14ca4102a25fac278041d999 /indra/newview | |
| parent | ff2721823fc091b3eccabba2886b90e30d9ec305 (diff) | |
Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llcommandhandler.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llxmlrpclistener.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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 */ |