Allow building tests with Clang, and fix some bugs Clang diagnosed.
Change-Id: Ie213deadabdb9c84d4ea1d2f69b1beaa87165717
diff --git a/authorization_set.cpp b/authorization_set.cpp
index 35a12b2..5fbf608 100644
--- a/authorization_set.cpp
+++ b/authorization_set.cpp
@@ -157,7 +157,7 @@
if (indirect_data_capacity_ - indirect_data_size_ < elem.blob.data_length) {
size_t new_capacity = 2 * (indirect_data_capacity_ + elem.blob.data_length);
uint8_t* new_data = new uint8_t[new_capacity];
- if (new_data == false) {
+ if (new_data == NULL) {
set_invalid(ALLOCATION_FAILURE);
return false;
}
@@ -403,7 +403,7 @@
if (pos == -1) {
return false;
}
- *val = (*this)[pos].enumerated;
+ *val = elems_[pos].enumerated;
return true;
}
@@ -418,7 +418,7 @@
}
++count;
}
- *val = (*this)[pos].enumerated;
+ *val = elems_[pos].enumerated;
return true;
}
@@ -427,7 +427,7 @@
if (pos == -1) {
return false;
}
- *val = (*this)[pos].integer;
+ *val = elems_[pos].integer;
return true;
}
@@ -442,7 +442,7 @@
}
++count;
}
- *val = (*this)[pos].integer;
+ *val = elems_[pos].integer;
return true;
}
@@ -451,7 +451,7 @@
if (pos == -1) {
return false;
}
- *val = (*this)[pos].long_integer;
+ *val = elems_[pos].long_integer;
return true;
}
@@ -460,7 +460,7 @@
if (pos == -1) {
return false;
}
- *val = (*this)[pos].date_time;
+ *val = elems_[pos].date_time;
return true;
}
@@ -469,7 +469,7 @@
if (pos == -1) {
return false;
}
- *val = (*this)[pos].blob;
+ *val = elems_[pos].blob;
return true;
}