diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-19 16:30:19 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-19 16:30:19 -0500 |
commit | 40fb9d3e58fcb28778c57a835795ff4a1ef90b98 (patch) | |
tree | 55fe9990117737dfb1a90aa7f7b88f1a504b3e94 /indra/llcorehttp/httpcommon.h | |
parent | 1df282efa1b4de813ceed42549eff47fad21a33d (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/httpcommon.h')
-rw-r--r-- | indra/llcorehttp/httpcommon.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h index b2db01d038..ea0c38abd7 100644 --- a/indra/llcorehttp/httpcommon.h +++ b/indra/llcorehttp/httpcommon.h @@ -382,10 +382,10 @@ struct HttpStatus /// creates an ambiguous second path to integer conversion /// which tends to find programming errors such as formatting /// the status to a stream (operator<<). - operator unsigned long() const; - unsigned long toULong() const + operator U32() const; + U32 toULong() const { - return operator unsigned long(); + return operator U32(); } /// And to convert to a hex string. |