diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-12 08:18:22 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-12 08:18:22 -0700 |
| commit | 9b3166ffc0cb3a686ea1f3007110976fbf81ea1c (patch) | |
| tree | 5884820ab4bd08b66d9ba28c134feef197131038 /indra/llcommon/lleventdispatcher.h | |
| parent | 1dcc9e3e1163b93d7654fc776d8e81252f15a6e1 (diff) | |
| parent | b92ab8f7e659de66140cc6f538c74c1fc81e6a73 (diff) | |
pull from v64 gate
Diffstat (limited to 'indra/llcommon/lleventdispatcher.h')
| -rw-r--r-- | indra/llcommon/lleventdispatcher.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h index 7acc61de4e..9e1244ef5b 100644 --- a/indra/llcommon/lleventdispatcher.h +++ b/indra/llcommon/lleventdispatcher.h @@ -47,13 +47,13 @@ // namespace) that a global 'nil' macro breaks badly. #if defined(nil) // Capture the value of the macro 'nil', hoping int is an appropriate type. -static const int nil_(nil); +static const auto nil_(nil); // Now forget the macro. #undef nil // Finally, reintroduce 'nil' as a properly-scoped alias for the previously- // defined const 'nil_'. Make it static since otherwise it produces duplicate- // symbol link errors later. -static const int& nil(nil_); +static const auto& nil(nil_); #endif #include <string> |