diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-05-24 16:07:29 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-05-24 16:07:29 -0400 |
| commit | 0ebdfaa5fc72a6b3a65d4acd75697b77cc8738d7 (patch) | |
| tree | 933444e64669ba2e532fb8da7ab257206b53aaca /indra/newview/tests/llversioninfo_test.cpp | |
| parent | ec8ee339396aedb4032ae123843ae630546cd588 (diff) | |
| parent | b247c4e42434715459df93b5cbf6adb15d3c4cc4 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/maint-maint-8675
Diffstat (limited to 'indra/newview/tests/llversioninfo_test.cpp')
| -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 { |