diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:54:34 -0500 |
| commit | 1f2fcc12980dd21659bce493431b7a1b3fe2ef00 (patch) | |
| tree | 7a678b096eaa89f655c7e74fb2aacf57b38afe77 /indra/llcommon/lleventdispatcher.h | |
| parent | f0b256b1cb6c96aed81ee456e505247fd2169c5f (diff) | |
| parent | ae0b3149badf369eb2b1f10aba830eef8b4af9b4 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-c-11
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> |