sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Added ResourceConstListener"

Browse Source 
This reverts commit 2492f87ba89bafa180308c60d2470b07e3aac27d [formerly 793b9a8884fb6153d5da152e2cf22659fc7e511b].


Former-commit-id: 05a9dff26921db1e7c1c5b90c0cd50073a839f3c
This commit is contained in:
Lynix
2015-01-16 13:02:53 +01:00
parent 40db7a7292
commit c2f3ba00f2
4 changed files with 0 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Core/Resource.hpp
View File

@@ -17,7 +17,6 @@
#include <Nazara/Core/ThreadSafetyOff.hpp>
#endif
class NzResourceConstListener;
class NzResourceListener;
class NAZARA_API NzResource
@@ -26,7 +25,6 @@ class NAZARA_API NzResource
NzResource(bool persistent = true);
virtual ~NzResource();
void AddResourceConstListener(const NzResourceConstListener* listener, int index = 0) const;
void AddResourceListener(NzResourceListener* listener, int index = 0) const;
void AddResourceReference() const;
@@ -34,7 +32,6 @@ class NAZARA_API NzResource
bool IsPersistent() const;
void RemoveResourceConstListener(const NzResourceConstListener* listener) const;
void RemoveResourceListener(NzResourceListener* listener) const;
bool RemoveResourceReference() const;
@@ -46,16 +43,13 @@ class NAZARA_API NzResource
void NotifyModified(unsigned int code);
private:
using ResourceConstListenerMap = std::unordered_map<const NzResourceConstListener*, std::pair<int, unsigned int>>;
using ResourceListenerMap = std::unordered_map<NzResourceListener*, std::pair<int, unsigned int>>;
void RemoveResourceConstListenerIterator(ResourceConstListenerMap::iterator iterator) const;
void RemoveResourceListenerIterator(ResourceListenerMap::iterator iterator) const;
NazaraMutexAttrib(m_mutex, mutable)
// Je fais précéder le nom par 'resource' pour éviter les éventuels conflits de noms
mutable ResourceConstListenerMap m_resourceConstListeners;
mutable ResourceListenerMap m_resourceListeners;
std::atomic_bool m_resourcePersistent;
mutable std::atomic_uint m_resourceReferenceCount;