diff options
author | Max Horn | 2011-06-20 00:59:48 +0200 |
---|---|---|
committer | Max Horn | 2011-06-20 00:59:48 +0200 |
commit | 88913c0139ac6d1dfb356d3048702b7bc8ef4079 (patch) | |
tree | a7436d20333c28f87f2ed0bc15c743b5eb8144ee /backends/plugins/elf/memory-manager.h | |
parent | 3853e76202b132e769ae149720eca931cd87104a (diff) | |
download | scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.gz scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.tar.bz2 scummvm-rg350-88913c0139ac6d1dfb356d3048702b7bc8ef4079.zip |
ALL: Remove trailing whitespaces
This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'backends/plugins/elf/memory-manager.h')
-rw-r--r-- | backends/plugins/elf/memory-manager.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/backends/plugins/elf/memory-manager.h b/backends/plugins/elf/memory-manager.h index ac70e5e3bb..032ecb2be5 100644 --- a/backends/plugins/elf/memory-manager.h +++ b/backends/plugins/elf/memory-manager.h @@ -30,17 +30,17 @@ #include "common/singleton.h" #include "common/list.h" #include "common/mutex.h" - + /** - * A 'foolproof' way to prevent memory fragmentation. This class is used to - * serve as a permanent allocation to prevent the process of loading and + * A 'foolproof' way to prevent memory fragmentation. This class is used to + * serve as a permanent allocation to prevent the process of loading and * unloading plugins from causing heavy fragmentation. **/ - + #define ELFMemMan ELFMemoryManager::instance() - + class ELFMemoryManager : public Common::Singleton<ELFMemoryManager> { -public: +public: void trackPlugin(bool value); void trackAlloc(uint32 align, uint32 size); @@ -49,7 +49,7 @@ public: void *pluginAllocate(uint32 size); void *pluginAllocate(uint32 align, uint32 size); void pluginDeallocate(void *ptr); - + private: friend class Common::Singleton<ELFMemoryManager>; @@ -58,7 +58,7 @@ private: void *allocateOnHeap(uint32 align, uint32 size); void deallocateFromHeap(void *ptr); - + struct Allocation { byte *start; uint32 size; @@ -70,17 +70,17 @@ private: void *_heap; uint32 _heapAlign; // alignment of the heap uint32 _heapSize; // size of the heap - + // tracking allocations bool _trackAllocs; // whether we are currently tracking - uint32 _measuredSize; - uint32 _measuredAlign; - + uint32 _measuredSize; + uint32 _measuredAlign; + // real allocations Common::List<Allocation> _allocList; uint32 _bytesAllocated; }; - + #endif /* defined(DYNAMIC_MODULES) && defined(USE_ELF_LOADER) */ #endif /* ELF_MEMORY_MANAGER_H */ |