From 765da171323a8ed48d4ec1de09a437f34b149b2f Mon Sep 17 00:00:00 2001 From: Reijo Tomperi Date: Sun, 8 Mar 2009 09:49:04 +0200 Subject: [PATCH] Astyle fix --- src/preprocessor.cpp | 10 +++++----- test/testpreprocessor.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/preprocessor.cpp b/src/preprocessor.cpp index 3d0316beb..fdc525566 100644 --- a/src/preprocessor.cpp +++ b/src/preprocessor.cpp @@ -449,16 +449,16 @@ std::string Preprocessor::getcode(const std::string &filedata, std::string cfg) } if (line.find("#file \"") == 0 || - line.find("#endfile") == 0 ) + line.find("#endfile") == 0) { // We must not remove #file tags or line numbers // are corrupted. File tags are removed by the tokenizer. } else if (!match || - line.find("#if") == 0 || - line.find("#else") == 0 || - line.find("#elif") == 0 || - line.find("#endif") == 0) + line.find("#if") == 0 || + line.find("#else") == 0 || + line.find("#elif") == 0 || + line.find("#endif") == 0) line = ""; ret << line << "\n"; diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp index 349000bd7..6f59f0339 100644 --- a/test/testpreprocessor.cpp +++ b/test/testpreprocessor.cpp @@ -342,10 +342,10 @@ private: preprocessor.preprocess(istr, actual, "file.c"); Tokenizer tok; - std::istringstream codeStream( actual[""] ); - tok.tokenize( codeStream, "main.cpp" ); + std::istringstream codeStream(actual[""]); + tok.tokenize(codeStream, "main.cpp"); - ASSERT_EQUALS( "\n\n##file 0\n1:\n2:\n3:\n4: int main ( ) { }\n", tok.tokens()->stringifyList() ); + ASSERT_EQUALS("\n\n##file 0\n1:\n2:\n3:\n4: int main ( ) { }\n", tok.tokens()->stringifyList()); // Expected configurations: "" and "ABC" ASSERT_EQUALS(2, static_cast(actual.size()));