From b7c63630a4720aaf5c32a04c52687cdfd9436d33 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Mon, 11 May 2015 15:43:55 +0300 Subject: Initialize the atomic_flag in the class definition ATOMIC_FLAG_INIT is often defined to { 0 } or { false } and some compilers might complain about initializing as flag(ATOMIC_FLAG_INIT). --- src/mbgl/map/tile_data.cpp | 1 - src/mbgl/map/tile_data.hpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/mbgl/map/tile_data.cpp b/src/mbgl/map/tile_data.cpp index c6d87c7bde..51ae37fd1c 100644 --- a/src/mbgl/map/tile_data.cpp +++ b/src/mbgl/map/tile_data.cpp @@ -13,7 +13,6 @@ TileData::TileData(const TileID& id_, const SourceInfo& source_) : id(id_), name(id), state(State::initial), - parsing(ATOMIC_FLAG_INIT), source(source_), env(Environment::Get()), debugBucket(debugFontBuffer) { diff --git a/src/mbgl/map/tile_data.hpp b/src/mbgl/map/tile_data.hpp index ecc53a6b5e..57f7c30ff3 100644 --- a/src/mbgl/map/tile_data.hpp +++ b/src/mbgl/map/tile_data.hpp @@ -62,7 +62,7 @@ public: const TileID id; const std::string name; std::atomic state; - std::atomic_flag parsing; + std::atomic_flag parsing = ATOMIC_FLAG_INIT; protected: // Set the internal parsing state to true so we prevent -- cgit v1.2.1