diff options
| author | Ilya Zverev <ilya@zverev.info> | 2015-11-13 19:51:40 +0300 |
|---|---|---|
| committer | Ilya Zverev <ilya@zverev.info> | 2015-11-13 19:51:40 +0300 |
| commit | 9bc8a7b12977a3c61ac432ae7286b9b24fe72537 (patch) | |
| tree | b33a731ac1269fdf2e858f1843777fad8323d1ce | |
| parent | b7c56290d254da30c81c84b2e4627e84b3b67b1c (diff) | |
| parent | df9dbb75b4f18d26f133410294951cdc5c1b94a3 (diff) | |
Merge pull request #511 from mapsme/warning-fixes
Linux warning fixes.
| -rw-r--r-- | 3party/agg/agg_basics.h | 2 | ||||
| -rw-r--r-- | 3party/agg/agg_trans_affine.h | 10 | ||||
| -rw-r--r-- | common.pri | 14 |
3 files changed, 16 insertions, 10 deletions
diff --git a/3party/agg/agg_basics.h b/3party/agg/agg_basics.h index b3071b1bb8..8e17fafce5 100644 --- a/3party/agg/agg_basics.h +++ b/3party/agg/agg_basics.h @@ -203,7 +203,7 @@ namespace agg { AGG_INLINE static unsigned mul(unsigned a, unsigned b) { - register unsigned q = a * b + (1 << (Shift-1)); + unsigned q = a * b + (1 << (Shift-1)); return (q + (q >> Shift)) >> Shift; } }; diff --git a/3party/agg/agg_trans_affine.h b/3party/agg/agg_trans_affine.h index 8933d7618a..1a61163883 100644 --- a/3party/agg/agg_trans_affine.h +++ b/3party/agg/agg_trans_affine.h @@ -292,7 +292,7 @@ namespace agg //------------------------------------------------------------------------ inline void trans_affine::transform(double* x, double* y) const { - register double tmp = *x; + double tmp = *x; *x = tmp * sx + *y * shx + tx; *y = tmp * shy + *y * sy + ty; } @@ -300,7 +300,7 @@ namespace agg //------------------------------------------------------------------------ inline void trans_affine::transform_2x2(double* x, double* y) const { - register double tmp = *x; + double tmp = *x; *x = tmp * sx + *y * shx; *y = tmp * shy + *y * sy; } @@ -308,9 +308,9 @@ namespace agg //------------------------------------------------------------------------ inline void trans_affine::inverse_transform(double* x, double* y) const { - register double d = determinant_reciprocal(); - register double a = (*x - tx) * d; - register double b = (*y - ty) * d; + double d = determinant_reciprocal(); + double a = (*x - tx) * d; + double b = (*y - ty) * d; *x = a * sy - b * shx; *y = b * sx - a * shy; } diff --git a/common.pri b/common.pri index 3f679d815e..c643eed621 100644 --- a/common.pri +++ b/common.pri @@ -130,10 +130,16 @@ win32-msvc201* { # unix also works for Android unix|win32-g++ { LIBS *= -lz - QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare -Wno-strict-aliasing -Wno-unused-parameter \ - -Wno-unused-local-typedef - *-clang { - QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion -Werror=return-type -Wno-deprecated-register + QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare -Wno-strict-aliasing -Wno-unused-parameter + + # -Wno-unused-local-typedef is not supported on clang 3.5. + IS_CLANG35 = $$system( echo | $$QMAKE_CXX -dM -E - | grep '__clang_version__.*3\.5.*' ) + if (isEmpty(IS_CLANG35)){ + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-local-typedef + } + # TODO: Check if we really need these warnings on every platform (by syershov). + *-clang* { + QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-conversion -Werror=return-type } tizen{ |