summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2016-02-18 13:07:24 -0700
committerShawn Willden <swillden@google.com>2016-02-18 13:07:49 -0700
commit4de9dbe8f533944656f421369cfd7d438d105cb5 (patch)
treeb2ad5b00fb2b092399e35afca47fee947202fa13
parente8c8ec844005e525100556ab01e84d1cd7960a26 (diff)
downloadkeymaster-4de9dbe8f533944656f421369cfd7d438d105cb5.tar.gz
Make GCC happier with initializer lists.brillo-m10-releasebrillo-m10-dev
Change-Id: Ib2623116621797b1136633f0fe3e95168ebca678
-rw-r--r--authorization_set.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/authorization_set.cpp b/authorization_set.cpp
index 3a5b46e..09093c9 100644
--- a/authorization_set.cpp
+++ b/authorization_set.cpp
@@ -206,12 +206,12 @@ bool AuthorizationSet::erase(size_t index) {
return true;
}
-keymaster_key_param_t empty_set = {};
+keymaster_key_param_t empty_set = {KM_TAG_INVALID, {}};
keymaster_key_param_t& AuthorizationSet::operator[](int at) {
if (is_valid() == OK && at < (int)elems_size_) {
return elems_[at];
}
- empty_set = {};
+ empty_set = {KM_TAG_INVALID, {}};
return empty_set;
}
@@ -219,7 +219,7 @@ keymaster_key_param_t AuthorizationSet::operator[](int at) const {
if (is_valid() == OK && at < (int)elems_size_) {
return elems_[at];
}
- empty_set = {};
+ empty_set = {KM_TAG_INVALID, {}};
return empty_set;
}