From 0b44e4d59b2c7cb60d65d4c3ab64cb33c49cda67 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Sat, 18 Oct 2014 11:09:07 -0700 Subject: Update to build on Xcode 6.0: more removal of unused const variables [-Wunused-const-variable] and member variables --- indra/llui/llxuiparser.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/llui/llxuiparser.cpp') diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 37d88cb9f9..f6a44338a4 100755 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -58,8 +58,6 @@ static LLInitParam::Parser::parser_inspect_func_map_t sSimpleXUIInspectFuncs; const char* NO_VALUE_MARKER = "no_value"; -const S32 LINE_NUMBER_HERE = 0; - struct MaxOccursValues : public LLInitParam::TypeValuesHelper { static void declareValues() -- cgit v1.2.3 From b66389c02e0fedb8e507668e53dd43339c1e3326 Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 11 Dec 2014 16:43:48 -0800 Subject: Re-add missing variable declaration (not that it's very useful and no idea how it was removed) --- indra/llui/llxuiparser.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llui/llxuiparser.cpp') diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index f6a44338a4..37d88cb9f9 100755 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -58,6 +58,8 @@ static LLInitParam::Parser::parser_inspect_func_map_t sSimpleXUIInspectFuncs; const char* NO_VALUE_MARKER = "no_value"; +const S32 LINE_NUMBER_HERE = 0; + struct MaxOccursValues : public LLInitParam::TypeValuesHelper { static void declareValues() -- cgit v1.2.3 From 7282d29bf82deaeb5649b09f062d42c04df6eb55 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 12 Dec 2014 13:39:57 -0800 Subject: Make LINE_NUMBER_HERE workaround conditional on LL_WINDOWS. The referencing code is all within LL_WINDOWS conditionals, so the dummy variable must be enclosed that way too -- otherwise we get unreferenced-variable warnings-as-errors on other platforms. --- indra/llui/llxuiparser.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llui/llxuiparser.cpp') diff --git a/indra/llui/llxuiparser.cpp b/indra/llui/llxuiparser.cpp index 37d88cb9f9..99a0869ce3 100755 --- a/indra/llui/llxuiparser.cpp +++ b/indra/llui/llxuiparser.cpp @@ -58,7 +58,9 @@ static LLInitParam::Parser::parser_inspect_func_map_t sSimpleXUIInspectFuncs; const char* NO_VALUE_MARKER = "no_value"; +#ifdef LL_WINDOWS const S32 LINE_NUMBER_HERE = 0; +#endif struct MaxOccursValues : public LLInitParam::TypeValuesHelper { -- cgit v1.2.3