swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

Minor fixes including removing <> from make_pair usage and using explicit conversions where required by the explicit constructor flags

Browse Source 
Now builds/runs using c++11
This commit is contained in:
Anonymous
2014-01-23 08:55:46 -07:00
parent fabe85739d
commit e6431a9fd4
14 changed files with 34 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.cpp
+5 -5
View File
@@ -59,35 +59,35 @@ extern "C"
// ======================================================================
void *operator new(size_t size, MemoryManagerNotALeak) throw (std::bad_alloc)
void *operator new(size_t size, MemoryManagerNotALeak)
{
return MemoryManager::allocate(size, reinterpret_cast<uint32>(__builtin_return_address(0)), false, false);
}
// ----------------------------------------------------------------------
void *operator new(size_t size) throw (std::bad_alloc)
void *operator new(std::size_t size)
{
return MemoryManager::allocate(size, reinterpret_cast<uint32>(__builtin_return_address(0)), false, true);
}
// ----------------------------------------------------------------------
void *operator new[](size_t size) throw (std::bad_alloc)
void *operator new[](size_t size)
{
return MemoryManager::allocate(size, reinterpret_cast<uint32>(__builtin_return_address(0)), true, true);
}
// ----------------------------------------------------------------------
void *operator new(size_t size, const char *file, int line) throw (std::bad_alloc)
void *operator new(size_t size, const char *file, int line)
{
return MemoryManager::allocate(size, reinterpret_cast<uint32>(__builtin_return_address(0)), false, true);
}
// ----------------------------------------------------------------------
void *operator new[](size_t size, const char *file, int line) throw (std::bad_alloc)
void *operator new[](size_t size, const char *file, int line)
{
return MemoryManager::allocate(size, reinterpret_cast<uint32>(__builtin_return_address(0)), true, true);
}
engine/shared/library/sharedMemoryManager/src/linux/OsNewDel.h
+6 -5
View File
@@ -10,17 +10,18 @@
#define INCLUDED_OsNewDel_H
// ======================================================================
#include <cstddef>
enum MemoryManagerNotALeak
{
MM_notALeak
};
void *operator new(size_t size, MemoryManagerNotALeak) throw(std::bad_alloc);
void *operator new(size_t size) throw(std::bad_alloc);
void *operator new[](size_t size) throw(std::bad_alloc);
void *operator new(size_t size, char const *file, int line) throw(std::bad_alloc);
void *operator new[](size_t size, char const *file, int line) throw(std::bad_alloc);
void *operator new(size_t size, MemoryManagerNotALeak);
void *operator new(size_t size);
void *operator new[](std::size_t size);
void *operator new(size_t size, char const *file, int line);
void *operator new[](size_t size, char const *file, int line);
void operator delete(void *pointer) throw();
void operator delete[](void *pointer) throw();