diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-08-02 16:15:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-08-02 16:15:34 -0400 |
| commit | 67955043306bddcb22cee706415fe702807e1a30 (patch) | |
| tree | d13e4ea862af00dbb78dbed4468eb78a03eff28b /indra/newview/tests | |
| parent | 09f97172bb478a2c977d8b7b0958196e7e98c433 (diff) | |
| parent | f1eb3c1b63b97de2a91c967e5c66f7b25c4963a2 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 { |