From 321617c33dbaa93248e6b01ce3d2dfe35cb5cfa2 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Wed, 19 Jul 2017 22:02:25 +0000 Subject: [PATCH] [libcxx] [test] Fix MSVC warning C4067 "unexpected tokens following preprocessor directive - expected a newline". Also fixes Clang/LLVM 4.0 (for Windows) error "function-like macro 'TEST_GLIBC_PREREQ' is not defined". Fixes D34535. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@308533 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../locale.moneypunct.byname/curr_symbol.pass.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp b/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp index 8490b708b..3a9adc4bb 100644 --- a/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp +++ b/test/std/localization/locale.categories/category.monetary/locale.moneypunct.byname/curr_symbol.pass.cpp @@ -117,7 +117,13 @@ int main() // GLIBC <= 2.23 uses currency_symbol="" // GLIBC >= 2.24 uses currency_symbol="" // See also: http://www.fileformat.info/info/unicode/char/20bd/index.htm -#if defined(TEST_GLIBC_PREREQ) && TEST_GLIBC_PREREQ(2, 24) +#if defined(TEST_GLIBC_PREREQ) + #if TEST_GLIBC_PREREQ(2, 24) + #define TEST_GLIBC_2_24_CURRENCY_SYMBOL + #endif +#endif + +#if defined(TEST_GLIBC_2_24_CURRENCY_SYMBOL) assert(f.curr_symbol() == " \u20BD"); #else assert(f.curr_symbol() == " \xD1\x80\xD1\x83\xD0\xB1"); @@ -129,7 +135,7 @@ int main() } { Fwf f(LOCALE_ru_RU_UTF_8, 1); -#if defined(TEST_GLIBC_PREREQ) && TEST_GLIBC_PREREQ(2, 24) +#if defined(TEST_GLIBC_2_24_CURRENCY_SYMBOL) assert(f.curr_symbol() == L" \u20BD"); #else assert(f.curr_symbol() == L" \x440\x443\x431");