From 51924431cdf9ca3816c80236df30a51556b4a863 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 13 Apr 2010 09:42:53 +0000 Subject: [PATCH] Fixed warnings --- include/osg/observer_ptr | 3 ++- include/osgDB/StreamOperator | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/osg/observer_ptr b/include/osg/observer_ptr index aca5eca0b..e0e3362c9 100644 --- a/include/osg/observer_ptr +++ b/include/osg/observer_ptr @@ -40,7 +40,8 @@ class observer_ptr : public Observer observer_ptr(): _ptr(0L) {} observer_ptr(T* t): _ptr(t) { if (_ptr) _ptr->addObserver(this); } - observer_ptr(const observer_ptr& rp) + observer_ptr(const observer_ptr& rp): + Observer() { OpenThreads::ScopedLock lock(*getObserverMutex()); _ptr = rp._ptr; diff --git a/include/osgDB/StreamOperator b/include/osgDB/StreamOperator index 2f4944c23..de3c1e516 100644 --- a/include/osgDB/StreamOperator +++ b/include/osgDB/StreamOperator @@ -84,7 +84,7 @@ public: virtual void readCharArray( char* s, unsigned int size ) = 0; virtual void readWrappedString( std::string& str ) = 0; - virtual bool matchString( const std::string& str ) { return false; } + virtual bool matchString( const std::string& /*str*/ ) { return false; } virtual void advanceToCurrentEndBracket() {} protected: