summaryrefslogtreecommitdiff
path: root/src/3rdparty
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-08-27 14:58:03 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-28 05:08:03 +0200
commit64a5278704db4103018c73901c2f949c9df3afac (patch)
tree92cb25533930fb140d39da0fe70b76710c89ed29 /src/3rdparty
parent2f4abb7946fd987fbdde2ed9864db32c0a3a6b48 (diff)
downloadqtlocation-64a5278704db4103018c73901c2f949c9df3afac.tar.gz
Fix compiler warnings with MSVC.
- Unused variables. - 64bit truncations. Change-Id: I358a1378e875fea4a0790db3c30e422a0b9eba40 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/poly2tri/sweep/sweep_context.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/poly2tri/sweep/sweep_context.h b/src/3rdparty/poly2tri/sweep/sweep_context.h
index 08bba8cb..482ab795 100644
--- a/src/3rdparty/poly2tri/sweep/sweep_context.h
+++ b/src/3rdparty/poly2tri/sweep/sweep_context.h
@@ -40,7 +40,7 @@ namespace p2t {
// Inital triangle factor, seed triangle will extend 30% of
// PointSet width to both left and right.
-const float kAlpha = 0.3;
+const float kAlpha = float(0.3);
struct Point;
class Triangle;
@@ -158,7 +158,7 @@ inline AdvancingFront* SweepContext::front()
inline int SweepContext::point_count()
{
- return points_.size();
+ return int(points_.size());
}
inline void SweepContext::set_head(Point* p1)