From b7235f1a4492bf4365d241e239eb49fb3ae8bb3e Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Mon, 22 Apr 2013 14:35:07 -0400
Subject: [PATCH] MAINT-2612: Remove no-longer-valid unused-var warning
suppressions. Somehow viewer-cat acquired a lot of source lines (in several
different files) of the form: (void)somevar; where ?somevar? was not
declared. Apparently someone introduced an unused declaration of ?somevar?,
encountered unused-variable warnings, introduced the (void) casts to suppress
those warnings, then deleted the declarations -- without deleting the (void)
casts. It seems worth noting that the resulting code should not have compiled
successfully on any platform.
---
indra/test/io.cpp | 1 -
indra/test/llstreamtools_tut.cpp | 7 -------
indra/test/lltemplatemessagebuilder_tut.cpp | 1 -
3 files changed, 9 deletions(-)
diff --git a/indra/test/io.cpp b/indra/test/io.cpp
index 62e516accb9..47a67deed00 100644
--- a/indra/test/io.cpp
+++ b/indra/test/io.cpp
@@ -1141,7 +1141,6 @@ namespace tut
ensure("Connected to server", connected);
lldebugs << "connected" << llendl;
pump_loop(mPump,0.1f);
- (void)elapsed;
count = mPump->runningChains();
ensure_equals("server chain onboard", count, 2);
lldebugs << "** Client is connected." << llendl;
diff --git a/indra/test/llstreamtools_tut.cpp b/indra/test/llstreamtools_tut.cpp
index a9bb15d9113..354c3dfe109 100644
--- a/indra/test/llstreamtools_tut.cpp
+++ b/indra/test/llstreamtools_tut.cpp
@@ -389,13 +389,10 @@ namespace tut
is.str(str = " First Second \t \r \n Third Fourth-ShouldThisBePartOfFourth Fifth\n");
actual_result = "";
get_word(actual_result, is); // First
- (void)ret;
actual_result = "";
get_word(actual_result, is); // Second
- (void)ret;
actual_result = "";
get_word(actual_result, is); // Third
- (void)ret;
// the current implementation of get_word seems inconsistent with
// skip_to_next_word. skip_to_next_word treats any character other
@@ -486,7 +483,6 @@ namespace tut
is.str(str = "First Second \t \r\n Third Fourth-ShouldThisBePartOfFourth IsThisFifth\n");
actual_result = "";
get_line(actual_result, is);
- (void)ret;
expected_result = "First Second \t \r\n";
ensure_equals("get_line: 1", actual_result, expected_result);
@@ -551,7 +547,6 @@ namespace tut
is.str(str = "Should not skip lone \r.\r\n");
actual_result = "";
get_line(actual_result, is);
- (void)ret;
expected_result = "Should not skip lone \r.\r\n";
ensure_equals("get_line: carriage return skipped even though not followed by newline", actual_result, expected_result);
}
@@ -569,7 +564,6 @@ namespace tut
is.str(str = "\n");
actual_result = "";
get_line(actual_result, is);
- (void)ret;
expected_result = "\n";
ensure_equals("get_line: Just newline", actual_result, expected_result);
}
@@ -588,7 +582,6 @@ namespace tut
is.str(str = "First Line.\nSecond Line.\n");
actual_result = "";
get_line(actual_result, is, 255);
- (void)ret;
expected_result = "First Line.\n";
ensure_equals("get_line: Basic Operation", actual_result, expected_result);
diff --git a/indra/test/lltemplatemessagebuilder_tut.cpp b/indra/test/lltemplatemessagebuilder_tut.cpp
index 3d3edab102b..dde70f98c8f 100644
--- a/indra/test/lltemplatemessagebuilder_tut.cpp
+++ b/indra/test/lltemplatemessagebuilder_tut.cpp
@@ -963,7 +963,6 @@ namespace tut
memset(buffer, 0xcc, bufferSize);
reader->getString(_PREHASH_Test1, _PREHASH_Test0, bufferSize,
outBuffer);
- (void)outValue2;
ensure_equals("Ensure present value ", outValue, inValue);
ensure_equals("Ensure unchanged buffer ", strlen(outBuffer), 0);
delete reader;
--
GitLab