FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for Win32 build.

Browse Source
This commit is contained in:
Robert Osfield
2002-04-12 14:05:55 +00:00
parent 91e9d71963
commit 468580a12c
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osg/MemoryManager.cpp
View File

@@ -675,6 +675,8 @@ void m_setOwner(const char *file, const unsigned int line, const char *func)
#ifdef OSG_USE_MEMORY_MANAGER
using namespace std;
void *operator new(size_t reportedSize) throw (std::bad_alloc)
{
#ifdef TEST_MEMORY_MANAGER
@@ -703,8 +705,8 @@ void *operator new(size_t reportedSize) throw (std::bad_alloc)
// There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
// set it back again.
std::new_handler nh = std::set_new_handler(0);
std::set_new_handler(nh);
new_handler nh = set_new_handler(0);
set_new_handler(nh);
// If there is an error handler, call it
@@ -755,8 +757,8 @@ void *operator new[](size_t reportedSize) throw (std::bad_alloc)
// There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
// set it back again.
std::new_handler nh = std::set_new_handler(0);
std::set_new_handler(nh);
new_handler nh = set_new_handler(0);
set_new_handler(nh);
// If there is an error handler, call it
@@ -813,8 +815,8 @@ void *operator new(size_t reportedSize, const char *sourceFile, int sourceLin
// There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
// set it back again.
std::new_handler nh = std::set_new_handler(0);
std::set_new_handler(nh);
new_handler nh = set_new_handler(0);
set_new_handler(nh);
// If there is an error handler, call it
@@ -865,8 +867,8 @@ void *operator new[](size_t reportedSize, const char *sourceFile, int sourceL
// There isn't a way to determine the new handler, except through setting it. So we'll just set it to NULL, then
// set it back again.
std::new_handler nh = std::set_new_handler(0);
std::set_new_handler(nh);
new_handler nh = set_new_handler(0);
set_new_handler(nh);
// If there is an error handler, call it