diff --git a/include/osgUtil/GLObjectsVisitor b/include/osgUtil/GLObjectsVisitor index 64c654eda..6216b2e71 100644 --- a/include/osgUtil/GLObjectsVisitor +++ b/include/osgUtil/GLObjectsVisitor @@ -14,6 +14,7 @@ #ifndef OSGUTIL_GLOBJECTSVISITOR #define OSGUTIL_GLOBJECTSVISITOR 1 +#include #include #include #include @@ -223,10 +224,10 @@ class OSGUTIL_EXPORT IncrementalCompileOperation : public osg::GraphicsOperation void add(CompileSet* compileSet, bool callBuildCompileMap=true); - OpenThreads::Mutex& getToCompiledMutex() { return _toCompileMutex; } + OpenThreads::Mutex* getToCompiledMutex() { return &_toCompileMutex; } CompileSets& getToCompile() { return _compiled; } - OpenThreads::Mutex& getCompiledMutex() { return _compiledMutex; } + OpenThreads::Mutex* getCompiledMutex() { return &_compiledMutex; } CompileSets& getCompiled() { return _compiled; } protected: diff --git a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp index b872a7cbd..6e680d47e 100644 --- a/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp +++ b/src/osgWrappers/osgUtil/GLObjectsVisitor.cpp @@ -198,9 +198,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation) __void__add__CompileSet_P1__bool, "Add a CompileSet to be compiled. ", ""); - I_Method0(OpenThreads::Mutex &, getToCompiledMutex, + I_Method0(OpenThreads::Mutex *, getToCompiledMutex, Properties::NON_VIRTUAL, - __OpenThreads_Mutex_R1__getToCompiledMutex, + __OpenThreads_Mutex_P1__getToCompiledMutex, "", ""); I_Method0(osgUtil::IncrementalCompileOperation::CompileSets &, getToCompile, @@ -208,9 +208,9 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation) __CompileSets_R1__getToCompile, "", ""); - I_Method0(OpenThreads::Mutex &, getCompiledMutex, + I_Method0(OpenThreads::Mutex *, getCompiledMutex, Properties::NON_VIRTUAL, - __OpenThreads_Mutex_R1__getCompiledMutex, + __OpenThreads_Mutex_P1__getCompiledMutex, "", ""); I_Method0(osgUtil::IncrementalCompileOperation::CompileSets &, getCompiled, @@ -221,14 +221,14 @@ BEGIN_OBJECT_REFLECTOR(osgUtil::IncrementalCompileOperation) I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSets &, Compiled, __CompileSets_R1__getCompiled, 0); - I_SimpleProperty(OpenThreads::Mutex &, CompiledMutex, - __OpenThreads_Mutex_R1__getCompiledMutex, + I_SimpleProperty(OpenThreads::Mutex *, CompiledMutex, + __OpenThreads_Mutex_P1__getCompiledMutex, 0); I_SimpleProperty(osgUtil::IncrementalCompileOperation::CompileSets &, ToCompile, __CompileSets_R1__getToCompile, 0); - I_SimpleProperty(OpenThreads::Mutex &, ToCompiledMutex, - __OpenThreads_Mutex_R1__getToCompiledMutex, + I_SimpleProperty(OpenThreads::Mutex *, ToCompiledMutex, + __OpenThreads_Mutex_P1__getToCompiledMutex, 0); END_REFLECTOR