diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-28 16:37:47 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-28 16:37:47 -0800 |
| commit | e1a76999c3e8aad337d765fcd6eb50c8191409ea (patch) | |
| tree | bc671ff3f6da473df49f2b834e94ee6150157256 /indra/newview/tests | |
| parent | d7ad30a2d4dfd83f93b0150464214f2df776eb9c (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merge
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 { |