From 2ffb3baaed1da73473d0ff2dafceac1a5d45f1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 27 Mar 2012 20:48:22 +0200 Subject: [PATCH] Preprocessor: fixed tests --- test/testpreprocessor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp index 89d785d9c..5ede16b43 100644 --- a/test/testpreprocessor.cpp +++ b/test/testpreprocessor.cpp @@ -1601,7 +1601,7 @@ private: #ifdef __GNUC__ ASSERT_EQUALS("\n\n$int a = 4; int b = 5;\n", actual[""]); #else - ASSERT_EQUALS("\nint b = 5;\nint a = 4;\\\n", actual[""]); + ASSERT_EQUALS("\nint b = 5;\n$int a = 4;\\\n", actual[""]); #endif ASSERT_EQUALS("", errout.str()); } @@ -3428,8 +3428,8 @@ private: void macroChar() { const char filedata[] = "#define X 1\nX\n"; ASSERT_EQUALS("\n$1\n", OurPreprocessor::expandMacros(filedata,NULL)); - OurPreprocessor::macroChar = '¤'; - ASSERT_EQUALS("\n¤1\n", OurPreprocessor::expandMacros(filedata,NULL)); + OurPreprocessor::macroChar = char(1); + ASSERT_EQUALS("\n" + std::string(char(1),1U) + "1\n", OurPreprocessor::expandMacros(filedata,NULL)); OurPreprocessor::macroChar = '$'; } };