diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2014-08-28 14:56:04 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2014-08-28 17:58:33 +0200 |
| commit | 703f36a4b8733a515093e2d1d85a3136728269eb (patch) | |
| tree | bcbdf3efe489a651d5bd9608eebad85c704c6ba3 /src/libs/cplusplus/PreprocessorEnvironment.cpp | |
| parent | 12642cc49a37e50eb3b099bfd34c28e6259b7526 (diff) | |
C++: remove reserved names.
See [global.names] (17.6.4.3.2 in the C++11 spec.)
Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/libs/cplusplus/PreprocessorEnvironment.cpp')
| -rw-r--r-- | src/libs/cplusplus/PreprocessorEnvironment.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libs/cplusplus/PreprocessorEnvironment.cpp b/src/libs/cplusplus/PreprocessorEnvironment.cpp index 792e48bb947..8cb9abcddcc 100644 --- a/src/libs/cplusplus/PreprocessorEnvironment.cpp +++ b/src/libs/cplusplus/PreprocessorEnvironment.cpp @@ -99,11 +99,11 @@ Macro *Environment::macroAt(unsigned index) const return _macros[index]; } -Macro *Environment::bind(const Macro &__macro) +Macro *Environment::bind(const Macro ¯o) { - Q_ASSERT(! __macro.name().isEmpty()); + Q_ASSERT(! macro.name().isEmpty()); - Macro *m = new Macro (__macro); + Macro *m = new Macro (macro); const QByteArray &name = m->name(); m->_hashcode = hashCode(name.begin(), name.size()); |