FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed unused variable warnings

Browse Source
This commit is contained in:
Robert Osfield 2016-08-26 19:18:00 +01:00
parent 322adc266c
commit 0ad09d6dad
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/osg/Referenced
View File

@ -47,6 +47,7 @@ class OSG_EXPORT Referenced
Referenced(); Referenced();
/// deprecated, Referenced is now always uses thread safe ref/unref, use default Refernced() constructor instead
explicit Referenced(bool threadSafeRefUnref); explicit Referenced(bool threadSafeRefUnref);
Referenced(const Referenced&); Referenced(const Referenced&);

2
src/osg/Callback.cpp
View File

@ -54,7 +54,7 @@ bool CallbackObject::run(osg::Object* object, osg::Object* data)
return run(object,inputParameters, outputParameters); return run(object,inputParameters, outputParameters);
} }
bool CallbackObject::run(osg::Object* object, osg::Parameters& inputParameters, osg::Parameters& outputParameters) const bool CallbackObject::run(osg::Object* object, osg::Parameters& /*inputParameters*/, osg::Parameters& /*outputParameters*/) const
{ {
OSG_NOTICE<<"CallbackObject::run(object="<<object<<")"<<std::endl; OSG_NOTICE<<"CallbackObject::run(object="<<object<<")"<<std::endl;
return false; return false;

7
src/osg/Referenced.cpp
View File

@ -143,7 +143,7 @@ Referenced::Referenced():
} }
Referenced::Referenced(bool threadSafeRefUnref): Referenced::Referenced(bool /*threadSafeRefUnref*/):
#if defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS) #if defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
_observerSet(0), _observerSet(0),
_refCount(0) _refCount(0)
@ -154,10 +154,7 @@ Referenced::Referenced(bool threadSafeRefUnref):
#endif #endif
{ {
#if !defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS) #if !defined(_OSG_REFERENCED_USE_ATOMIC_OPERATIONS)
#ifndef ENFORCE_THREADSAFE _refMutex = new OpenThreads::Mutex;
if (threadSafeRefUnref)
#endif
_refMutex = new OpenThreads::Mutex;
#endif #endif
#ifdef DEBUG_OBJECT_ALLOCATION_DESTRUCTION #ifdef DEBUG_OBJECT_ALLOCATION_DESTRUCTION