Skip to content

Commit

Permalink
address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
mwilsnd committed Aug 30, 2024
1 parent b40f745 commit 5fde810
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
4 changes: 3 additions & 1 deletion include/mbgl/gfx/context.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ using UniqueDrawableBuilder = std::unique_ptr<DrawableBuilder>;
using VertexAttributeArrayPtr = std::shared_ptr<VertexAttributeArray>;
#endif

static ContextObserver nullObserver;
namespace {
ContextObserver nullObserver;
}

class Context {
protected:
Expand Down
18 changes: 9 additions & 9 deletions include/mbgl/tile/tile_operation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@

namespace mbgl {
enum class TileOperation : uint8_t {
RequestedFromCache,
RequestedFromNetwork,
LoadFromNetwork,
LoadFromCache,
StartParse,
EndParse,
Error,
Cancelled,
NullOp,
RequestedFromCache, ///< A read request from the cache
RequestedFromNetwork, ///< A read request from the online source
LoadFromNetwork, ///< Tile data from the network has been retrieved
LoadFromCache, ///< Tile data from the cache has been retrieved
StartParse, ///< Background processing of tile data has been initiated
EndParse, ///< Background processing of tile data has been completed
Error, ///< An error occurred while loading the tile
Cancelled, ///< Loading of a tile was cancelled
NullOp, ///< No operation has taken place
};
} // namespace mbgl
4 changes: 0 additions & 4 deletions test/map/map.test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1695,10 +1695,6 @@ TEST(Map, ObserveTileLifecycle) {
OverscaledTileID id;
std::string sourceID;
TileOperation op;

bool operator==(const TileEntry& other) const noexcept {
return id == other.id && sourceID == other.sourceID && op == other.op;
}
};
std::mutex tileMutex;
std::vector<TileEntry> tileOps;
Expand Down

0 comments on commit 5fde810

Please sign in to comment.