Skip to content

Commit 8152fa9

Browse files
committed
code clean up
1 parent bfb56ee commit 8152fa9

File tree

2 files changed

+11
-25
lines changed

2 files changed

+11
-25
lines changed

Source/Library/MemoryManager.cpp

-18
Original file line numberDiff line numberDiff line change
@@ -47,24 +47,6 @@ namespace sd
4747
#endif
4848
} // namespace
4949

50-
void MemoryManager::ObjectsRegister::registerNew(const Object &object)
51-
{
52-
_objectsMap.insert({object.getRawPtr(), object});
53-
}
54-
55-
bool MemoryManager::ObjectsRegister::contains(void *objectPtr) const { return _objectsMap.contains(objectPtr); }
56-
57-
MemoryManager::Object &MemoryManager::ObjectsRegister::getObject(void *objectPtr)
58-
{
59-
return _objectsMap.at(objectPtr);
60-
}
61-
62-
void MemoryManager::ObjectsRegister::clear() { return _objectsMap.clear(); }
63-
64-
size_t MemoryManager::ObjectsRegister::numberOfRegisteredObjects() const { return _objectsMap.size(); }
65-
66-
bool MemoryManager::ObjectsRegister::anyObjectRegistered() const { return _objectsMap.empty(); }
67-
6850
MemoryManager &MemoryManager::instance()
6951
{
7052
static thread_local MemoryManager ob;

Source/Library/h/MemoryManager.hpp

+11-7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ namespace sd
1919
class MemoryManager : public IMemoryManager
2020
{
2121
private:
22+
#pragma region HelperClasses
2223
class Object
2324
{
2425
public:
@@ -101,13 +102,13 @@ namespace sd
101102
std::unordered_map<void *, Object> _objectsMap;
102103

103104
public:
104-
void registerNew(const Object &object);
105-
bool contains(void *objectPtr) const;
106-
void clear();
107-
Object &getObject(void *objectPtr);
105+
void registerNew(const Object &object) { _objectsMap.insert({object.getRawPtr(), object}); }
106+
bool contains(void *objectPtr) const { return _objectsMap.contains(objectPtr); }
107+
void clear() { _objectsMap.clear(); }
108+
Object &getObject(void *objectPtr) { return _objectsMap.at(objectPtr); }
108109

109-
size_t numberOfRegisteredObjects() const;
110-
bool anyObjectRegistered() const;
110+
size_t numberOfRegisteredObjects() const { return _objectsMap.size(); }
111+
bool anyObjectRegistered() const { return _objectsMap.empty(); }
111112

112113
template <class Fn> void unregisterIf(Fn predicate)
113114
{
@@ -118,7 +119,10 @@ namespace sd
118119
std::for_each(_objectsMap.begin(), _objectsMap.end(),
119120
[&](auto &pair) { return predicate(pair.second); });
120121
}
121-
} _register;
122+
};
123+
#pragma endregion
124+
125+
ObjectsRegister _register;
122126

123127
size_t _allocatedMemory = 0;
124128
size_t _memoryLimit = 1 * 1024 * 1024; // ~1MB

0 commit comments

Comments
 (0)