From 57a18ff112487457aa185b1f7ebd847b1436f44d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 22 Aug 2007 09:42:27 +0000 Subject: [PATCH] Added default setting of use of thread safe ref/unref. --- include/osg/DisplaySettings | 6 ++++-- include/osg/NodeVisitor | 6 +++++- src/osg/DisplaySettings.cpp | 2 +- src/osg/FrameStamp.cpp | 4 ++-- src/osg/NodeVisitor.cpp | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/include/osg/DisplaySettings b/include/osg/DisplaySettings index 70f4716aa..81983049e 100644 --- a/include/osg/DisplaySettings +++ b/include/osg/DisplaySettings @@ -36,13 +36,15 @@ class OSG_EXPORT DisplaySettings : public osg::Referenced static DisplaySettings* instance(); - DisplaySettings() + DisplaySettings(): + Referenced(true) { setDefaults(); readEnvironmentalVariables(); } - DisplaySettings(ArgumentParser& arguments) + DisplaySettings(ArgumentParser& arguments): + Referenced(true) { setDefaults(); readEnvironmentalVariables(); diff --git a/include/osg/NodeVisitor b/include/osg/NodeVisitor index fa2d26654..e08873a16 100644 --- a/include/osg/NodeVisitor +++ b/include/osg/NodeVisitor @@ -261,7 +261,11 @@ class OSG_EXPORT NodeVisitor : public virtual Referenced /** Callback for managing database paging, such as generated by PagedLOD nodes.*/ class DatabaseRequestHandler : public osg::Referenced { - public: + public: + + DatabaseRequestHandler(): + Referenced(true) {} + virtual void requestNodeFile(const std::string& fileName,osg::Group* group, float priority, const FrameStamp* framestamp) = 0; protected: diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp index ab448dcbf..1adba228a 100644 --- a/src/osg/DisplaySettings.cpp +++ b/src/osg/DisplaySettings.cpp @@ -27,7 +27,7 @@ DisplaySettings* DisplaySettings::instance() return s_displaySettings.get(); } -DisplaySettings::DisplaySettings(const DisplaySettings& vs):Referenced() +DisplaySettings::DisplaySettings(const DisplaySettings& vs):Referenced(true) { setDisplaySettings(vs); } diff --git a/src/osg/FrameStamp.cpp b/src/osg/FrameStamp.cpp index 66506e6b1..8f1b1ebaa 100644 --- a/src/osg/FrameStamp.cpp +++ b/src/osg/FrameStamp.cpp @@ -14,7 +14,7 @@ using namespace osg; -FrameStamp::FrameStamp():Referenced() +FrameStamp::FrameStamp():Referenced(true) { _frameNumber=0; _referenceTime=0; @@ -32,7 +32,7 @@ FrameStamp::FrameStamp():Referenced() } -FrameStamp::FrameStamp(const FrameStamp& fs):Referenced() +FrameStamp::FrameStamp(const FrameStamp& fs):Referenced(true) { _frameNumber = fs._frameNumber; _referenceTime = fs._referenceTime; diff --git a/src/osg/NodeVisitor.cpp b/src/osg/NodeVisitor.cpp index ea855cfd7..2abb0ac17 100644 --- a/src/osg/NodeVisitor.cpp +++ b/src/osg/NodeVisitor.cpp @@ -17,7 +17,7 @@ using namespace osg; NodeVisitor::NodeVisitor(TraversalMode tm): - Referenced() + Referenced(true) { _visitorType = NODE_VISITOR; _traversalNumber = -1; @@ -28,7 +28,7 @@ NodeVisitor::NodeVisitor(TraversalMode tm): } NodeVisitor::NodeVisitor(VisitorType type,TraversalMode tm): - Referenced() + Referenced(true) { _visitorType = type; _traversalNumber = -1;