diff --git a/lib/jkqtcommon/jkqtpcachingtools.h b/lib/jkqtcommon/jkqtpcachingtools.h index f1c0f6a4a8..f9fbd1b39c 100644 --- a/lib/jkqtcommon/jkqtpcachingtools.h +++ b/lib/jkqtcommon/jkqtpcachingtools.h @@ -33,6 +33,7 @@ #include #include #include +#include #include /** \brief tag type to configure JKQTPDataCache for thread-safety @@ -106,7 +107,7 @@ struct JKQTPDataCache { return it->second; } if (m_maxEntries>0 && m_cache.size()>=static_cast(m_maxEntries)) cleanCache_notThreadSafe(); - m_cacheLastUseTimestamps.emplace(cacheKey, std::make_shared>(currenTimestamp())); + m_cacheLastUseTimestamps.emplace(cacheKey, std::make_shared >(currenTimestamp())); const auto newData=m_generateData(key); m_cache.emplace(cacheKey,newData); return newData; @@ -124,7 +125,7 @@ struct JKQTPDataCache { if (m_maxEntries>0 && m_cache.size()>=static_cast(m_maxEntries)) cleanCache_notThreadSafe(); const auto newData=m_generateData(key); m_cache.emplace(cacheKey,newData); - m_cacheLastUseTimestamps.emplace(cacheKey, std::make_shared>(currenTimestamp())); + m_cacheLastUseTimestamps.emplace(cacheKey, std::make_shared >(currenTimestamp())); return newData; } @@ -182,7 +183,7 @@ private: const int m_maxEntries; const double m_retainFraction; std::unordered_map m_cache; - std::unordered_map>> m_cacheLastUseTimestamps; + std::unordered_map > > m_cacheLastUseTimestamps; mutable QReadWriteLock m_mutex; const std::function m_generateData; }; diff --git a/lib/jkqtcommon/jkqtpcsstools.cpp b/lib/jkqtcommon/jkqtpcsstools.cpp index 855906b8ec..3be88c5419 100644 --- a/lib/jkqtcommon/jkqtpcsstools.cpp +++ b/lib/jkqtcommon/jkqtpcsstools.cpp @@ -137,7 +137,7 @@ JKQTPExpected JKQTPCSSParser::parseColor(b return {JKQTPUnexpected, UnconvertobleError("#"+hex, "HEX-RGB value", pos) }; } } else if (CurrentToken.is(Token::TokenType::NAME)) { - static QMap> rgbFuncs={ + static QMap > rgbFuncs={ {"rgb", QPair(3,4)}, {"rgba",QPair(4,4)}, {"hsl",QPair(3,4)},