merged changes in from svn/trunk using :

svn merge -r 8736:8738 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk .
This commit is contained in:
Robert Osfield
2008-08-05 15:32:03 +00:00
parent 822fec0302
commit 46afd39b51
2 changed files with 33 additions and 2 deletions

View File

@@ -93,10 +93,22 @@ class NullStreamBuffer : public std::streambuf
}
};
struct NullStream : public std::ostream
{
NullStream():
std::ostream(new NullStreamBuffer) {}
virtual ~NullStream()
{
delete rdbuf();
rdbuf(0);
}
};
std::ostream& osg::notify(const osg::NotifySeverity severity)
{
// set up global notify null stream for inline notify
static std::ostream s_NotifyNulStream(new NullStreamBuffer());
static NullStream s_NotifyNulStream;
static bool initialized = false;
if (!initialized)