diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2016-10-31 23:57:36 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-11-03 15:31:30 +0000 |
commit | cf4e7575cad8975442191160723d766b48a9623f (patch) | |
tree | cf2d04c078c4aa9eb6f710e42593abc875da293b /src | |
parent | 9e53a91e99accae299ff7b4cc0a9c3675606d688 (diff) |
Fix GCC warning about ODR violation
There are two enums called "Operator"
qdrawhelper_p.h:201:8: warning: type ‘struct Operator’ violates the C++ One Definition Rule [-Wodr]
qopengl.cpp:138:6: note: a different type is defined in another translation unit
Change-Id: I09100678ff4443e6be06fffd1482da1f636614b7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/opengl/qopengl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/opengl/qopengl.cpp b/src/gui/opengl/qopengl.cpp index 3dedd7d7be..9f48d82c9d 100644 --- a/src/gui/opengl/qopengl.cpp +++ b/src/gui/opengl/qopengl.cpp @@ -129,9 +129,6 @@ QDebug operator<<(QDebug d, const QOpenGLConfig::Gpu &g) return d; } -enum Operator { NotEqual, LessThan, LessEqualThan, Equals, GreaterThan, GreaterEqualThan }; -static const char operators[][3] = {"!=", "<", "<=", "=", ">", ">="}; - static inline QString valueKey() { return QStringLiteral("value"); } static inline QString opKey() { return QStringLiteral("op"); } static inline QString versionKey() { return QStringLiteral("version"); } @@ -169,6 +166,9 @@ static inline bool contains(const QJsonArray &haystack, const QString &needle) } namespace { +enum Operator { NotEqual, LessThan, LessEqualThan, Equals, GreaterThan, GreaterEqualThan }; +static const char operators[][3] = {"!=", "<", "<=", "=", ">", ">="}; + // VersionTerm describing a version term consisting of number and operator // found in os.version and driver_version. struct VersionTerm { |