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

Cleaned up warning generated when compiling osgocculusviewer

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14695 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-17 10:36:41 +00:00
parent 6bddbdf074
commit 53198f2e9b
7 changed files with 35 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Callback
View File

@@ -26,7 +26,8 @@ class OSG_EXPORT Callback : public virtual Object {
Callback(){}
Callback(const Callback& cb,const CopyOp&):
Callback(const Callback& cb,const CopyOp& copyop):
osg::Object(cb, copyop),
_nestedCallback(cb._nestedCallback) {}
META_Object(osg, Callback);
@@ -96,7 +97,10 @@ class OSG_EXPORT CallbackObject : public virtual osg::Callback
public:
CallbackObject() {}
CallbackObject(const std::string& name) { setName(name); }
CallbackObject(const CallbackObject& rhs, const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):osg::Callback(rhs,copyop) {}
CallbackObject(const CallbackObject& co, const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):
osg::Object(co, copyop),
osg::Callback(co,copyop) {}
META_Object(osg, CallbackObject);
virtual CallbackObject* asCallbackObject() { return this; }