mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 19:19:56 +00:00
Code Issues Releases Wiki Activity

Move WeakCache to components/misc

Browse source
This commit is contained in:
Andrei Kortunov 2018-09-28 16:47:47 +04:00
parent 35abf7367c
commit 43c7438e8e
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/model/world/actoradapter.hpp
View file

@ -8,9 +8,9 @@
#include <QObject> #include <QObject>
#include <QModelIndex> #include <QModelIndex>
#include <components/cache/weakcache.hpp>
#include <components/esm/loadarmo.hpp> #include <components/esm/loadarmo.hpp>
#include <components/esm/loadbody.hpp> #include <components/esm/loadbody.hpp>
#include <components/misc/weakcache.hpp>
#include "refidcollection.hpp" #include "refidcollection.hpp"
#include "idcollection.hpp" #include "idcollection.hpp"
@ -163,8 +163,8 @@ namespace CSMWorld
IdCollection<ESM::Race>& mRaces; IdCollection<ESM::Race>& mRaces;
IdCollection<ESM::BodyPart>& mBodyParts; IdCollection<ESM::BodyPart>& mBodyParts;
cache::WeakCache<std::string, ActorData> mCachedActors; // Key: referenceable id Misc::WeakCache<std::string, ActorData> mCachedActors; // Key: referenceable id
cache::WeakCache<std::string, RaceData> mCachedRaces; // Key: race id Misc::WeakCache<std::string, RaceData> mCachedRaces; // Key: race id
StringSet mDirtyActors; // Actors that need updating StringSet mDirtyActors; // Actors that need updating
StringSet mDirtyRaces; // Races that need updating StringSet mDirtyRaces; // Races that need updating

6
components/CMakeLists.txt
View file

@ -86,7 +86,7 @@ add_component_dir (esmterrain
) )
add_component_dir (misc add_component_dir (misc
constants utf8stream stringops resourcehelpers rng messageformatparser constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
) )
add_component_dir (debug add_component_dir (debug
@ -150,10 +150,6 @@ add_component_dir (fallback
fallback validate fallback validate
) )
add_component_dir(cache
weakcache
)
if(NOT WIN32 AND NOT ANDROID) if(NOT WIN32 AND NOT ANDROID)
add_component_dir (crashcatcher add_component_dir (crashcatcher
crashcatcher crashcatcher

2
components/cache/weakcache.hpp → components/misc/weakcache.hpp
View file

@ -5,7 +5,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
namespace cache namespace Misc
{ {
/// \class WeakCache /// \class WeakCache
/// Provides a container to weakly store pointers to shared data. /// Provides a container to weakly store pointers to shared data.