Merge pull request #9393 from pan-/fix-safe-enum-type-safety

BLE: Fix SafeEnum type safety

Author: Cruz Monrreal

features/FEATURE_BLE/ble/SafeEnum.h

@@ -112,85 +112,87 @@ struct SafeEnum {
 	 */
 	typedef LayoutType representation_t;
 
+protected:
     /**
      * Construction of an enumeration value.
      */
-	SafeEnum(LayoutType value) : _value(value) { }
+	explicit SafeEnum(LayoutType value) : _value(value) { }
 
+public:
     /**
-     * Equal to operator for SafeEnum instances.
+     * Equal to operator for Target instances.
      *
      * @param lhs left hand side of the comparison
      * @param rhs right hand side of the comparison
      *
      * @return true if the inner value of lhs and rhs are equal and false
      * otherwise.
      */
-	friend bool operator==(SafeEnum lhs, SafeEnum rhs) {
+	friend bool operator==(Target lhs, Target rhs) {
 		return lhs._value == rhs._value;
 	}
 
     /**
-     * Not equal to operator for SafeEnum instances.
+     * Not equal to operator for Target instances.
      *
      * @param lhs left hand side of the comparison
      * @param rhs right hand side of the comparison
      *
      * @return true if the inner value of lhs and rhs are not equal and false
      * otherwise.
      */
-	friend bool operator!=(SafeEnum lhs, SafeEnum rhs) {
+	friend bool operator!=(Target lhs, Target rhs) {
 		return !(lhs == rhs);
 	}
 
 	/**
-	 * Less than operator for SafeEnum instances.
+	 * Less than operator for Target instances.
 	 *
      * @param lhs left hand side of the comparison
      * @param rhs right hand side of the comparison
      *
      * @return true if the inner value of lhs is less than rhs and false otherwise.
 	 */
-	friend bool operator<(SafeEnum lhs, SafeEnum rhs) {
+	friend bool operator<(Target lhs, Target rhs) {
 	    return lhs.value() < rhs.value();
 	}
 
     /**
-     * Less than or equal to operator for SafeEnum instances.
+     * Less than or equal to operator for Target instances.
      *
      * @param lhs left hand side of the comparison
      * @param rhs right hand side of the comparison
      *
      * @return true if the inner value of lhs is less than or equal to rhs and
      * false otherwise.
      */
-	friend bool operator<=(SafeEnum lhs, SafeEnum rhs) {
+	friend bool operator<=(Target lhs, Target rhs) {
 	    return lhs.value() < rhs.value() || lhs == rhs;
 	}
 
     /**
-     * Greater than operator for SafeEnum instances.
+     * Greater than operator for Target instances.
      *
      * @param lhs left hand side of the comparison
      * @param rhs right hand side of the comparison
      *
      * @return true if the inner value of lhs is greater than rhs; false
      * otherwise.
      */
-    friend bool operator>(SafeEnum lhs, SafeEnum rhs) {
+    friend bool operator>(Target lhs, Target rhs) {
         return !(lhs <= rhs);
     }
 
     /**
-     * Greater than or equal to operator for SafeEnum instances.
+     * Greater than or equal to operator for Target instances.
      *
      * @param lhs left hand side of the comparison
      * @param rhs right hand side of the comparison
      *
      * @return true if the inner value of lhs is greater than or equal to rhs;
      * false otherwise.
      */
-    friend bool operator>=(SafeEnum lhs, SafeEnum rhs) {
+    friend bool operator>=(Target lhs, Target rhs) {
         return !(lhs < rhs);
     }
 

features/FEATURE_BLE/source/gap/AdvertisingDataBuilder.cpp

@@ -331,7 +331,7 @@ uint8_t *AdvertisingDataBuilder::findField(adv_data_type_t type)
     for (uint8_t idx = 0; idx < _payload_length;) {
         uint8_t fieldType = _buffer[idx + FIELD_TYPE_INDEX];
 
-        if (fieldType == type) {
+        if (fieldType == type.value()) {
             return _buffer.data() + idx;
         }