diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-22 11:16:55 -0500 |
| commit | be69197e0d3af1832a22c6d2475e3e1178a88a31 (patch) | |
| tree | de9abd1dfc12d6da7e11e385c7dbbb53e631353a /indra/llcorehttp/httpcommon.h | |
| parent | 04c7a7a64ac40f471dcec0019a2c7235ad22bd3d (diff) | |
| parent | e9f5ed6591fb5d2513b5065622b9e7dac6737913 (diff) | |
merge changes from project trunk
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. |