Changeset 10917 for OpenSceneGraph/trunk/include/osgIntrospection/Value

Timestamp:

01/05/10 21:03:02 (3 years ago)

Author:

robert

Message:

Replaced nullptr with isNullPointer

Files:

• OpenSceneGraph/trunk/include/osgIntrospection/Value (modified) (6 diffs)

OpenSceneGraph/trunk/include/osgIntrospection/Value

@@ -225 +225 @@
             virtual const Type* ptype() const { return 0; }
             // returns whether the data is a null pointer
-            virtual bool nullptr() const = 0;
+            virtual bool isNullPointer() const = 0;
 
             Instance_base *inst_;
@@ -236 +236 @@
         struct Instance_box: Instance_box_base
         {
-            Instance_box(): Instance_box_base(), nullptr_(false) {}
-
-            Instance_box(const T &d, bool nullptr = false)
+            Instance_box(): Instance_box_base(), _isNullPointer(false) {}
+
+            Instance_box(const T &d, bool isNullPointer = false)
             :    Instance_box_base(),
-                nullptr_(nullptr)
+                _isNullPointer(isNullPointer)
             {
                 Instance<T> *vl = new Instance<T>(d);
@@ -259 +259 @@
                 new_inbox->_ref_inst = new Instance<T &>(vl->_data);
                 new_inbox->_const_ref_inst = new Instance<const T &>(vl->_data);
-                new_inbox->nullptr_ = nullptr_;
+                new_inbox->_isNullPointer = _isNullPointer;
                 return new_inbox;
             }
@@ -268 +268 @@
             }
 
-            virtual bool nullptr() const
-            {
-                return nullptr_;
+            virtual bool isNullPointer() const
+            {
+                return _isNullPointer;
             }
 
         private:
-            bool nullptr_;
+            bool _isNullPointer;
 
             Instance_box& operator = (const Instance_box&) { return *this; }
@@ -323 +323 @@
             }
 
-            virtual bool nullptr() const
+            virtual bool isNullPointer() const
             {
                 return static_cast<Instance<T> *>(inst_)->_data == 0;
@@ -429 +429 @@
     inline bool Value::isNullPointer() const
     {
-        return _inbox->nullptr();
+        return _inbox->isNullPointer();
     }