diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-05-23 17:10:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-05-23 17:10:08 -0400 |
| commit | c665a05b7863277e7da744f70421c37d8786c230 (patch) | |
| tree | ee6e4f08e129cae1091f7be57e1ba884bbb446ce /indra/newview/tests | |
| parent | c730ae22f8dc4d31db00244da2fdc44e2e943bd7 (diff) | |
| parent | 43716d580049bb026904133f0804e8c8d1f519aa (diff) | |
Automated merge with ssh://bitbucket.org/oz_linden/maint-8675
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llversioninfo_test.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/tests/llversioninfo_test.cpp b/indra/newview/tests/llversioninfo_test.cpp index 2f7a4e9601..58f0469552 100644 --- a/indra/newview/tests/llversioninfo_test.cpp +++ b/indra/newview/tests/llversioninfo_test.cpp @@ -33,10 +33,8 @@ // LL_VIEWER_CHANNEL is a macro defined on the compiler command line. The // macro expands to the string name of the channel, but without quotes. We -// need to turn it into a quoted string. This macro trick does that. -#define stringize_inner(x) #x -#define stringize_outer(x) stringize_inner(x) -#define ll_viewer_channel stringize_outer(LL_VIEWER_CHANNEL) +// need to turn it into a quoted string. LL_TO_STRING() does that. +#define ll_viewer_channel LL_TO_STRING(LL_VIEWER_CHANNEL) namespace tut { |