diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-05-08 09:10:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-05-08 09:10:22 -0400 |
| commit | 93029a5a66f6797391a86affa40eb6185e291efc (patch) | |
| tree | 1da629a2543f49ffb7cbe0e6095ff21f8a1ba711 /indra/llcommon/llpreprocessor.h | |
| parent | 322767f98e3c3164e3be03daa85580038ca6fb52 (diff) | |
| parent | 322c4c6bec54b4968d0105cf1bb28bb62c6dfcbc (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/llcommon/llpreprocessor.h')
| -rw-r--r-- | indra/llcommon/llpreprocessor.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h index 3698d9db44..2879038c36 100644 --- a/indra/llcommon/llpreprocessor.h +++ b/indra/llcommon/llpreprocessor.h @@ -192,13 +192,9 @@ # define LL_COMMON_API #endif // LL_COMMON_LINK_SHARED -#if LL_WINDOWS -#define LL_TYPEOF(exp) decltype(exp) -#elif LL_LINUX -#define LL_TYPEOF(exp) typeof(exp) -#elif LL_DARWIN -#define LL_TYPEOF(exp) typeof(exp) -#endif +// With C++11, decltype() is standard. We no longer need a platform-dependent +// macro to get the type of an expression. +#define LL_TYPEOF(expr) decltype(expr) #define LL_TO_STRING_HELPER(x) #x #define LL_TO_STRING(x) LL_TO_STRING_HELPER(x) |