diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:06:11 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-22 18:19:01 +0200 |
| commit | 214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5 (patch) | |
| tree | f06145cf70bf7860abd2c6edf88e2294d4ecb830 /include/mbgl/renderer | |
| parent | 74387c54e35e0f8f6bf1dcc7b7b171a3ec6db212 (diff) | |
| download | qtlocation-mapboxgl-214f99673f6f7480f9cc3bf9d6fa32ef8dd2ede5.tar.gz | |
fix variable shadowing
Diffstat (limited to 'include/mbgl/renderer')
| -rw-r--r-- | include/mbgl/renderer/frame_history.hpp | 2 | ||||
| -rw-r--r-- | include/mbgl/renderer/painter.hpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/mbgl/renderer/frame_history.hpp b/include/mbgl/renderer/frame_history.hpp index b1f0bcb597..61bb59da33 100644 --- a/include/mbgl/renderer/frame_history.hpp +++ b/include/mbgl/renderer/frame_history.hpp @@ -11,7 +11,7 @@ namespace mbgl { struct FrameSnapshot { - explicit inline FrameSnapshot(timestamp t, float z) : t(t), z(z) {} + explicit inline FrameSnapshot(timestamp t_, float z_) : t(t_), z(z_) {} float t; float z; }; diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index 0f9bd79173..a8229a0978 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -154,10 +154,10 @@ public: // used to composite images and flips the geometry upside down const mat4 flipMatrix = []{ - mat4 flipMatrix; - matrix::ortho(flipMatrix, 0, 4096, -4096, 0, 0, 1); - matrix::translate(flipMatrix, flipMatrix, 0, -4096, 0); - return flipMatrix; + mat4 flip; + matrix::ortho(flip, 0, 4096, -4096, 0, 0, 1); + matrix::translate(flip, flip, 0, -4096, 0); + return flip; }(); const mat4 identityMatrix = []{ |