Changeset 11096 for code/trunk/src/libraries/util/tribool.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/tribool.h (modified) (11 diffs)

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

@@ -10 +10 @@
 // so that (dontcare == dontcare).
 // Also removed all logic operators except for == and !=
+// Added C++11 constexpr
 
 
@@ -22 +23 @@
  * The type of the 'dontcare' keyword.
  */
-struct dontcare_keyword_t { };
+struct dontcare_keyword_t {};
 
 /**
  * \brief Keyword for the dontcare tribool value
  */
-const dontcare_keyword_t dontcare = dontcare_keyword_t();
+constexpr dontcare_keyword_t dontcare = dontcare_keyword_t();
 
 /**
@@ -43 +44 @@
    * \throws nothrow
    */
-  tribool() : value(false_value) {}
+  constexpr tribool() : value(false_value) {}
 
   /**
@@ -51 +52 @@
    * \throws nothrow
    */
-  tribool(bool value) : value(value? true_value : false_value) {}
+  constexpr tribool(bool value) : value(value? true_value : false_value) {}
 
   /**
@@ -58 +59 @@
    * \throws nothrow
    */
-  tribool(dontcare_keyword_t) : value(dontcare_value) {}
+  constexpr tribool(dontcare_keyword_t) : value(dontcare_value) {}
 
   /**
@@ -66 +67 @@
    * \throws nothrow
    */
-  inline bool operator==(tribool y)
+  constexpr bool operator==(tribool y) const
   {
     return (this->value == y.value);
@@ -74 +75 @@
    * \overload
    */
-  inline bool operator==(bool y) { return (*this) == tribool(y); }
+  constexpr bool operator==(bool y) const { return (*this) == tribool(y); }
 
   /**
    * \overload
    */
-  inline bool operator==(dontcare_keyword_t)
+  constexpr bool operator==(dontcare_keyword_t) const
   { return tribool(dontcare) == (*this); }
 
@@ -88 +89 @@
    * \throws nothrow
    */
-  inline bool operator!=(tribool y)
+  constexpr bool operator!=(tribool y) const
   {
     return !((*this) == y);
@@ -96 +97 @@
    * \overload
    */
-  inline bool operator!=(bool y) { return (*this) != tribool(y); }
+  constexpr bool operator!=(bool y) const { return (*this) != tribool(y); }
 
   /**
    * \overload
    */
-  inline bool operator!=(dontcare_keyword_t)
+  constexpr bool operator!=(dontcare_keyword_t) const
   { return (*this) != tribool(dontcare); }
 
@@ -114 +115 @@
  * \overload
  */
-inline bool operator==(bool x, tribool y) { return tribool(x) == y; }
+constexpr bool operator==(bool x, tribool y) { return tribool(x) == y; }
 
 /**
  * \overload
  */
-inline bool operator==(dontcare_keyword_t, tribool x)
+constexpr bool operator==(dontcare_keyword_t, tribool x)
 { return tribool(dontcare) == x; }
 
@@ -125 +126 @@
  * \overload
  */
-inline bool operator!=(bool x, tribool y) { return tribool(x) != y; }
+constexpr bool operator!=(bool x, tribool y) { return tribool(x) != y; }
 
 /**
  * \overload
  */
-inline bool operator!=(dontcare_keyword_t, tribool x)
+constexpr bool operator!=(dontcare_keyword_t, tribool x)
 { return tribool(dontcare) != x; }