From 7977b31577d5e5796bc4bb09c54541033b6bf4e9 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 12 Mar 2012 14:22:48 +0000 Subject: [PATCH] Moved static initializers into global scope to prevent problems with using exit(). --- src/osgViewer/Scene.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgViewer/Scene.cpp b/src/osgViewer/Scene.cpp index fcec0a2c6..c3dab6d3a 100644 --- a/src/osgViewer/Scene.cpp +++ b/src/osgViewer/Scene.cpp @@ -18,15 +18,15 @@ using namespace osgViewer; typedef std::vector< osg::observer_ptr > SceneCache; +static SceneCache s_sceneCache; static SceneCache& getSceneCache() { - static SceneCache s_sceneCache; return s_sceneCache; } +static OpenThreads::Mutex s_sceneCacheMutex; static OpenThreads::Mutex& getSceneCacheMutex() { - static OpenThreads::Mutex s_sceneCacheMutex; return s_sceneCacheMutex; }