diff options
| author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-01-17 15:53:56 -0800 |
|---|---|---|
| committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-01-17 15:53:56 -0800 |
| commit | 5a12a88f7b53bb99a6b302c35d891a8ecee59855 (patch) | |
| tree | dd52f7a9f76ac5d696a517f351371ceb619b7d30 /indra/llcorehttp/httpcommon.h | |
| parent | d4ce47b09122d1f76601ba402c2b9ad6bb504950 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
Merged lindenlab/viewer-release into default
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. |