diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-01-17 16:06:27 +0000 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2018-01-17 16:06:27 +0000 |
| commit | e36745eb986ec9dd04c7f4f6d7a7249b7d5286a2 (patch) | |
| tree | e2107a6f3afd57fcc817a5b8ea3566295105d0d4 /indra/llcommon/lleventdispatcher.h | |
| parent | 500aaa16ff2aa35b318176fd01cfaba47376f5a5 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
merge
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> |