From db7cc1c55982089ec9b13a7bec3d8a4529f3fedc Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Sat, 14 Dec 2002 07:55:29 +0000 Subject: [PATCH] Disabled the MemoryManager in all builds since it isn't yet thread safe. --- include/osg/Export | 8 +++++++- include/osgDB/Export | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/osg/Export b/include/osg/Export index 78380bc9b..075a2dc65 100644 --- a/include/osg/Export +++ b/include/osg/Export @@ -46,6 +46,12 @@ #endif #endif -#include +//#include +//#include +//#include +#define osgNew new +#define osgDelete delete +#define osgFree free +#define osgMalloc malloc #endif diff --git a/include/osgDB/Export b/include/osgDB/Export index d0ee9ba2b..e582f6595 100644 --- a/include/osgDB/Export +++ b/include/osgDB/Export @@ -24,6 +24,11 @@ # define OSGDB_EXPORT #endif -#include +//#include +#define osgNew new +#define osgDelete delete +#define osgFree free +#define osgMalloc malloc + #endif