Merge pull request #3145 from ReinUsesLisp/buffer-cache-init

buffer_cache: Remove brace initialized for objects with default constructor
This commit is contained in:
bunnei 2019-11-24 02:55:02 -05:00 committed by GitHub
commit e81e0036b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -427,8 +427,8 @@ private:
VideoCore::RasterizerInterface& rasterizer; VideoCore::RasterizerInterface& rasterizer;
Core::System& system; Core::System& system;
std::unique_ptr<StreamBuffer> stream_buffer;
std::unique_ptr<StreamBuffer> stream_buffer;
TBufferType stream_buffer_handle{}; TBufferType stream_buffer_handle{};
bool invalidated = false; bool invalidated = false;
@ -440,18 +440,18 @@ private:
using IntervalSet = boost::icl::interval_set<CacheAddr>; using IntervalSet = boost::icl::interval_set<CacheAddr>;
using IntervalCache = boost::icl::interval_map<CacheAddr, MapInterval>; using IntervalCache = boost::icl::interval_map<CacheAddr, MapInterval>;
using IntervalType = typename IntervalCache::interval_type; using IntervalType = typename IntervalCache::interval_type;
IntervalCache mapped_addresses{}; IntervalCache mapped_addresses;
static constexpr u64 write_page_bit{11}; static constexpr u64 write_page_bit = 11;
std::unordered_map<u64, u32> written_pages{}; std::unordered_map<u64, u32> written_pages;
static constexpr u64 block_page_bits{21}; static constexpr u64 block_page_bits = 21;
static constexpr u64 block_page_size{1 << block_page_bits}; static constexpr u64 block_page_size = 1ULL << block_page_bits;
std::unordered_map<u64, TBuffer> blocks{}; std::unordered_map<u64, TBuffer> blocks;
std::list<TBuffer> pending_destruction{}; std::list<TBuffer> pending_destruction;
u64 epoch{}; u64 epoch = 0;
u64 modified_ticks{}; u64 modified_ticks = 0;
std::recursive_mutex mutex; std::recursive_mutex mutex;
}; };