Skip to content
Snippets Groups Projects
Commit 68105d9f authored by Brad Kittenbrink's avatar Brad Kittenbrink
Browse files

Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4

parent 328329fc
No related branches found
No related tags found
No related merge requests found
...@@ -332,7 +332,7 @@ struct Data ...@@ -332,7 +332,7 @@ struct Data
const char* name; const char* name;
} typedata[] = } typedata[] =
{ {
#define def(type) { LLSD::type, #type + 4 } #define def(type) { LLSD::type, &#type[4] }
def(TypeUndefined), def(TypeUndefined),
def(TypeBoolean), def(TypeBoolean),
def(TypeInteger), def(TypeInteger),
......
...@@ -222,7 +222,7 @@ struct symbol_info ...@@ -222,7 +222,7 @@ struct symbol_info
#define ent(SYMBOL) \ #define ent(SYMBOL) \
{ \ { \
#SYMBOL + 28, /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \ &#SYMBOL[28], /* skip "LLCommandHandler::UNTRUSTED_" prefix */ \
SYMBOL \ SYMBOL \
} }
......
...@@ -100,7 +100,7 @@ class CURLcodeMapper: public StatusMapperBase<CURLcode> ...@@ -100,7 +100,7 @@ class CURLcodeMapper: public StatusMapperBase<CURLcode>
{ {
// from curl.h // from curl.h
// skip the "CURLE_" prefix for each of these strings // 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_OK);
def(CURLE_UNSUPPORTED_PROTOCOL); /* 1 */ def(CURLE_UNSUPPORTED_PROTOCOL); /* 1 */
def(CURLE_FAILED_INIT); /* 2 */ def(CURLE_FAILED_INIT); /* 2 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment