From 8a438948b977bdca4076054708aadb3cb5f7a2cc Mon Sep 17 00:00:00 2001 From: Bradley Austin Davis Date: Thu, 9 Mar 2017 10:42:56 -0800 Subject: [PATCH] Fix OSX link failure --- libraries/networking/src/FileCache.cpp | 7 +++++++ libraries/networking/src/FileCache.h | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libraries/networking/src/FileCache.cpp b/libraries/networking/src/FileCache.cpp index c94d0e1b8c..88f2c048e5 100644 --- a/libraries/networking/src/FileCache.cpp +++ b/libraries/networking/src/FileCache.cpp @@ -19,6 +19,7 @@ #include #include +#include Q_LOGGING_CATEGORY(file_cache, "hifi.file_cache", QtWarningMsg) @@ -26,6 +27,12 @@ using namespace cache; static const std::string MANIFEST_NAME = "manifest"; +static const size_t BYTES_PER_MEGABYTES = 1024 * 1024; +static const size_t BYTES_PER_GIGABYTES = 1024 * BYTES_PER_MEGABYTES; +const size_t FileCache::DEFAULT_UNUSED_MAX_SIZE = 5 * BYTES_PER_GIGABYTES; // 5GB +const size_t FileCache::MAX_UNUSED_MAX_SIZE = 100 * BYTES_PER_GIGABYTES; // 100GB +const size_t FileCache::DEFAULT_OFFLINE_MAX_SIZE = 2 * BYTES_PER_GIGABYTES; // 2GB + void FileCache::setUnusedFileCacheSize(size_t unusedFilesMaxSize) { _unusedFilesMaxSize = std::min(unusedFilesMaxSize, MAX_UNUSED_MAX_SIZE); reserve(0); diff --git a/libraries/networking/src/FileCache.h b/libraries/networking/src/FileCache.h index b19f2d10cd..945d43b224 100644 --- a/libraries/networking/src/FileCache.h +++ b/libraries/networking/src/FileCache.h @@ -35,11 +35,9 @@ class FileCache : public QObject { Q_PROPERTY(size_t sizeTotal READ getSizeTotalFiles NOTIFY dirty) Q_PROPERTY(size_t sizeCached READ getSizeCachedFiles NOTIFY dirty) - static const size_t BYTES_PER_MEGABYTES = 1024 * 1024; - static const size_t BYTES_PER_GIGABYTES = 1024 * BYTES_PER_MEGABYTES; - static const size_t DEFAULT_UNUSED_MAX_SIZE = 5 * BYTES_PER_GIGABYTES; // 5GB - static const size_t MAX_UNUSED_MAX_SIZE = 100 * BYTES_PER_GIGABYTES; // 100GB - static const size_t DEFAULT_OFFLINE_MAX_SIZE = 2 * BYTES_PER_GIGABYTES; // 2GB + static const size_t DEFAULT_UNUSED_MAX_SIZE; + static const size_t MAX_UNUSED_MAX_SIZE; + static const size_t DEFAULT_OFFLINE_MAX_SIZE; public: size_t getNumTotalFiles() const { return _numTotalFiles; }