summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-02-24 17:14:59 +0100
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-03-04 16:01:41 -0800
commit8112ac3371230d0d99733c4b71fb2fac3d610404 (patch)
tree4bc0abb7e48f4b675e98d9a392a29deb8e6285fe /src
parent661e9e7f49d6aadbd9c14a99b213d8fa0653b469 (diff)
downloadqtlocation-mapboxgl-8112ac3371230d0d99733c4b71fb2fac3d610404.tar.gz
[core] explicitly initialize a few fields to null
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/renderer/painter.hpp6
-rw-r--r--src/mbgl/util/thread.hpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 83d051359b..4a07d651d1 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -161,9 +161,9 @@ private:
float depthRangeSize;
const float depthEpsilon = 1.0f / (1 << 16);
- SpriteAtlas* spriteAtlas;
- GlyphAtlas* glyphAtlas;
- LineAtlas* lineAtlas;
+ SpriteAtlas* spriteAtlas = nullptr;
+ GlyphAtlas* glyphAtlas = nullptr;
+ LineAtlas* lineAtlas = nullptr;
FrameHistory frameHistory;
diff --git a/src/mbgl/util/thread.hpp b/src/mbgl/util/thread.hpp
index a7a5e73782..d05748a003 100644
--- a/src/mbgl/util/thread.hpp
+++ b/src/mbgl/util/thread.hpp
@@ -81,8 +81,8 @@ private:
std::thread thread;
- Object* object;
- RunLoop* loop;
+ Object* object = nullptr;
+ RunLoop* loop = nullptr;
};
template <class Object>