diff options
author | axis <qt-info@nokia.com> | 2009-08-19 11:38:05 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-08-19 11:40:30 (GMT) |
commit | 38466376233e7bcbc208602dde704baf20ef0952 (patch) | |
tree | e21e102acbf29f165016030a0ff31779dbc1dbc4 | |
parent | f8710c79adc55708a6484a0dcd3ce3d0ddd57284 (diff) | |
download | Qt-38466376233e7bcbc208602dde704baf20ef0952.zip Qt-38466376233e7bcbc208602dde704baf20ef0952.tar.gz Qt-38466376233e7bcbc208602dde704baf20ef0952.tar.bz2 |
Revert "The Metrowerks compiler was crashing when processing the following line in"
This reverts commit e2e4f600970a3577db4bcb099c10e8241754bd56.
Not needed anymore after the MWC compiler became unsupported.
RevBy: Jason Barron
-rw-r--r-- | src/tools/moc/preprocessor.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index 6650a1b..b4cf578 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -515,12 +515,7 @@ void Preprocessor::substituteMacro(const MacroName ¯o, Symbols &substituted, Symbols saveSymbols = symbols; int saveIndex = index; - // This is a workaround for a compiler bug that did not like the QHash::value function that - // simply did: "return T();" This code should essentially do the same thing but declares the - // default instance outside and calls the other QHash::value() implementation that returns - // 'dummy' as the default value now. - Macro dummy; - symbols = macros.value(macro, dummy).symbols; + symbols = macros.value(macro).symbols; index = 0; safeset += macro; |