Changeset 10770

Timestamp:

Nov 7, 2015, 2:42:14 PM (8 years ago)

Author:

landauf

Message:

made conversion to bool operators explicit

Location:

code/branches/cpp11_v2

Files:

• src/libraries/core/ClassTreeMask.h (modified) (2 diffs)
• src/libraries/core/object/IteratorBase.h (modified) (1 diff)
• src/libraries/core/object/StrongPtr.h (modified) (1 diff)
• src/libraries/core/object/WeakPtr.h (modified) (1 diff)
• src/libraries/util/SharedPtr.h (modified) (1 diff)
• test/util/SharedPtrTest.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h

@@ -152 +152 @@
             ClassTreeMaskNode* operator*() const;
             ClassTreeMaskNode* operator->() const;
-            operator bool() const;
+            explicit operator bool() const;
             bool operator==(ClassTreeMaskNode* compare) const;
             bool operator!=(ClassTreeMaskNode* compare) const;
@@ -289 +289 @@
             inline bool operator!=(BaseObject* pointer) const { return (this->objectIterator_ && (*this->objectIterator_) != pointer) || (!this->objectIterator_ && pointer != nullptr); }
             /// Returns true if the ClassTreeMaskObjectIterator hasn't already reached the end.
-            inline operator bool() const { return (this->objectIterator_); }
+            inline explicit operator bool() const { return this->objectIterator_.operator bool(); }
             /// Returns the object the ClassTreeMaskObjectIterator currently points at.
             inline BaseObject* operator*() const { return (*this->objectIterator_); }

code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h

@@ -149 +149 @@
                 @return True if the Iterator points to an existing object.
             */
-            inline operator bool() const
+            inline explicit operator bool() const
             {
                 return (this->element_ != nullptr);

code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h

@@ -248 +248 @@
             }
 
-            /// Returns true if the wrapped pointer is nullptr.
-            inline bool operator!() const
-            {
-                return (this->pointer_ == nullptr);
+            /// Returns true if the pointer is not nullptr.
+            inline explicit operator bool() const
+            {
+                return (this->pointer_ != nullptr);
             }
 

code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h

@@ -183 +183 @@
             }
 
-            /// Returns true if the wrapped pointer is nullptr.
-            inline bool operator!() const
-            {
-                return (this->pointer_ == nullptr);
+            /// Returns true if the pointer is not nullptr.
+            inline explicit operator bool() const
+            {
+                return (this->pointer_ != nullptr);
             }
 

code/branches/cpp11_v2/src/libraries/util/SharedPtr.h

@@ -311 +311 @@
 
             /// Returns true if the pointer is not nullptr.
-            inline operator bool() const
+            inline explicit operator bool() const
             {
                 return (this->pointer_ != nullptr);

code/branches/cpp11_v2/test/util/SharedPtrTest.cc

@@ -145 +145 @@
         test = pointer;
         EXPECT_EQ(pointer, test.get());
-        EXPECT_TRUE(test);
+        EXPECT_TRUE(static_cast<bool>(test));
     }