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

2.8 branch: Enabling VS2010 builds.

Browse Source
This commit is contained in:
Paul MARTZ
2011-03-28 02:32:58 +00:00
parent fb91677fce
commit 38b454f824
13 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/NodeTrackerCallback
View File

@@ -18,6 +18,8 @@
#include <osg/NodeCallback>
#include <osg/observer_ptr>
#include <iterator>
namespace osg
{

2
include/osgGA/NodeTrackerManipulator
View File

@@ -19,6 +19,8 @@
#include <osg/Quat>
#include <osg/observer_ptr>
#include <iterator>
namespace osgGA{
class OSGGA_EXPORT NodeTrackerManipulator : public MatrixManipulator

12
include/osgIntrospection/Value
View File

@@ -224,7 +224,7 @@ namespace osgIntrospection
// returns the actual pointed type if applicable
virtual const Type* ptype() const { return 0; }
// returns whether the data is a null pointer
virtual bool nullptr() const = 0;
virtual bool isnullptr() const = 0;
Instance_base *inst_;
Instance_base *_ref_inst;
@@ -237,9 +237,9 @@ namespace osgIntrospection
{
Instance_box(): Instance_box_base(), nullptr_(false) {}
Instance_box(const T &d, bool nullptr = false)
Instance_box(const T &d, bool isnullptr = false)
: Instance_box_base(),
nullptr_(nullptr)
nullptr_(isnullptr)
{
Instance<T> *vl = new Instance<T>(d);
inst_ = vl;
@@ -267,7 +267,7 @@ namespace osgIntrospection
return &typeof(T);
}
virtual bool nullptr() const
virtual bool isnullptr() const
{
return nullptr_;
}
@@ -322,7 +322,7 @@ namespace osgIntrospection
return &typeofvalue(*static_cast<Instance<T> *>(inst_)->_data);
}
virtual bool nullptr() const
virtual bool isnullptr() const
{
return static_cast<Instance<T> *>(inst_)->_data == 0;
}
@@ -428,7 +428,7 @@ namespace osgIntrospection
inline bool Value::isNullPointer() const
{
return _inbox->nullptr();
return _inbox->isnullptr();
}
}