| commit | 0b7e6492354accfa1430846f14e39095c57c21dd | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Wed Sep 28 20:19:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Sep 28 20:19:01 2016 +0000 |
| tree | b75bd1bba188a56f1c45275c49126585a32f5b78 | |
| parent | 468ddcb585828048a72f48e14273d3c4fbad39b4 [diff] | |
| parent | e260a43a7e9f713e9ea25bd2c87574c2d3cc1e84 [diff] |
Merge "keystore: use static_cast for conversion between void* and uinti8_t*" am: e260a43a7e Change-Id: I9c8609aa73b95d9879b9002f591864bf44711865
diff --git a/keystore/IKeystoreService.cpp b/keystore/IKeystoreService.cpp index 5cfee80..9217fae 100644 --- a/keystore/IKeystoreService.cpp +++ b/keystore/IKeystoreService.cpp
@@ -235,7 +235,7 @@ return false; } - blob->data = reinterpret_cast<const uint8_t*>(malloc(length)); + blob->data = static_cast<const uint8_t*>(malloc(length)); if (!blob->data) return false;