summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/tests/test_httpstatus.hpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-19 16:30:19 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-19 16:30:19 -0500
commit40fb9d3e58fcb28778c57a835795ff4a1ef90b98 (patch)
tree55fe9990117737dfb1a90aa7f7b88f1a504b3e94 /indra/llcorehttp/tests/test_httpstatus.hpp
parent1df282efa1b4de813ceed42549eff47fad21a33d (diff)
DRTVWR-418: Use U32 for int (and hex) of HttpStatus in 64-bit too.
Turns out that Monty didn't intend for the int-flavored representation of HttpStatus to expand to 64 bits even when unsigned long is that wide. So change the implicit conversion operator, and its uses, to U32 instead. That produces a consistent toHex() result for both 32-bit and 64-bit builds.
Diffstat (limited to 'indra/llcorehttp/tests/test_httpstatus.hpp')
-rw-r--r--indra/llcorehttp/tests/test_httpstatus.hpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/llcorehttp/tests/test_httpstatus.hpp b/indra/llcorehttp/tests/test_httpstatus.hpp
index 10cda799e7..cbe3f574d4 100644
--- a/indra/llcorehttp/tests/test_httpstatus.hpp
+++ b/indra/llcorehttp/tests/test_httpstatus.hpp
@@ -244,11 +244,7 @@ void HttpStatusTestObjectType::test<7>()
HttpStatus status(404);
std::string msg = status.toHex();
// std::cout << "Result: " << msg << std::endl;
-#if ADDRESS_SIZE == 32
ensure_equals(msg, "01940001");
-#else
- ensure_equals(msg, "19400000001");
-#endif
}