Changeset 11096 for code/trunk/src/libraries/util/mbool.h

Timestamp:

Jan 25, 2016, 9:33:11 PM (8 years ago)

Author:

muemart

Message:

Constexpr for some util things

File:

• code/trunk/src/libraries/util/mbool.h (modified) (3 diffs)

code/trunk/src/libraries/util/mbool.h

@@ -60 +60 @@
         public:
             /// Constructor: Creates the mbool and initializes the boolean value (default to false).
-            inline mbool(bool value = false)
-                { this->value_.memory_ = 0; this->value_.bool_ = value; }
+            constexpr mbool(bool value = false) : value_{ static_cast<unsigned char>(value ? 1 : 0) }
+                {}
             /// Copy-constructor, copies state and memory.
-            inline mbool(const mbool& value)
-                { this->value_.memory_ = value.value_.memory_; }
+            constexpr mbool(const mbool& value) : value_{ value.value_.memory_ }
+                {}
             /// Destructor does nothing but not defining it might create a symbol (class is header only)
-            inline ~mbool()
-                { }
+            inline ~mbool() = default;
 
             /// Assigns a boolean value (and increases the memory value if the value is different to the old value).
@@ -84 +83 @@
 
             /// Implicitly converts the mbool to a bool.
-            inline operator bool() const
+            constexpr operator bool() const
                 { return this->value_.bool_; }
 
             /// Compares the mbool to a bool, returns true if the bool has the same value as the state of the mbool.
-            inline bool operator==(bool other) const
+            constexpr bool operator==(bool other) const
                 { return this->value_.bool_ == other; }
             /// Compares the mbool to a bool, returns true if the bool has a different value than the state of the mbool.
-            inline bool operator!=(bool other) const
+            constexpr bool operator!=(bool other) const
                 { return this->value_.bool_ != other; }
 
             /// Compares two mbools, returns true if their memory matches.
-            inline bool operator==(const mbool& other) const
+            constexpr bool operator==(const mbool& other) const
                 { return this->value_.memory_ == other.value_.memory_; }
             /// Compares two mbools, returns true if they have a different memory value.
-            inline bool operator!=(const mbool& other) const
+            constexpr bool operator!=(const mbool& other) const
                 { return this->value_.memory_ != other.value_.memory_; }
 
             /// Returns the inverted state of the bool (doesn't change the internal state).
-            inline bool operator!() const
+            constexpr bool operator!() const
                 { return (!this->value_.bool_); }
 
@@ -111 +110 @@
             union
             {
+                unsigned char memory_;  ///< The memory of the mbool, counts the state-changes (and the first bit represents also the boolean value)
                 bool bool_ : 1;         ///< The boolean state of the mbool, is located on the first bit of the memory variable
-                unsigned char memory_;  ///< The memory of the mbool, counts the state-changes (and the first bit represents also the boolean value)
             } value_;                   ///< A union containing the state and the memory of the mbool
     };