Changeset 10770 for code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h

Timestamp:

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

Author:

landauf

Message:

made conversion to bool operators explicit

File:

• code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h (modified) (2 diffs)

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_); }