Revert "Preprocessor: Report #error configuration when -D is used. Ticket: #2042"

This reverts commit 674644cb29.
This commit is contained in:
Daniel Marjamäki 2010-09-13 16:59:43 +02:00
parent 674644cb29
commit b1d74ed6b8
1 changed files with 1 additions and 2 deletions

View File

@ -231,8 +231,7 @@ std::string Preprocessor::removeComments(const std::string &str, const std::stri
writeError(filename, lineno, _errorLogger, "syntaxError", errmsg.str()); writeError(filename, lineno, _errorLogger, "syntaxError", errmsg.str());
} }
if ((str.compare(i, 6, "#error") == 0 && _settings->userDefines.empty()) || if (str.compare(i, 6, "#error") == 0 || str.compare(i, 8, "#warning") == 0)
str.compare(i, 8, "#warning") == 0)
{ {
if (str.compare(i, 6, "#error") == 0) if (str.compare(i, 6, "#error") == 0)
code << "#error"; code << "#error";