diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-07-29 16:57:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-29 16:57:17 +0000 |
| commit | 6dc68cb5f97a2f4fd3e0d105f34cd29dd73e0da5 (patch) | |
| tree | 533121e90d08e695f1f9243fd82049876411904e /trusty | |
| parent | 060b15e20ade882821e9f673abcd27c4e36f8857 (diff) | |
| parent | 034c475931e8e4da54b499c0056121490f029865 (diff) | |
| download | system_core-6dc68cb5f97a2f4fd3e0d105f34cd29dd73e0da5.tar.gz system_core-6dc68cb5f97a2f4fd3e0d105f34cd29dd73e0da5.tar.bz2 system_core-6dc68cb5f97a2f4fd3e0d105f34cd29dd73e0da5.zip | |
Merge "Fix google-explicit-constructor warnings in system/core."
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/gatekeeper/trusty_gatekeeper.h | 2 | ||||
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_device.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/trusty/gatekeeper/trusty_gatekeeper.h b/trusty/gatekeeper/trusty_gatekeeper.h index 82108dc04..2becc49a1 100644 --- a/trusty/gatekeeper/trusty_gatekeeper.h +++ b/trusty/gatekeeper/trusty_gatekeeper.h @@ -27,7 +27,7 @@ namespace gatekeeper { class TrustyGateKeeperDevice { public: - TrustyGateKeeperDevice(const hw_module_t* module); + explicit TrustyGateKeeperDevice(const hw_module_t* module); ~TrustyGateKeeperDevice(); hw_device_t* hw_device(); diff --git a/trusty/keymaster/trusty_keymaster_device.h b/trusty/keymaster/trusty_keymaster_device.h index cb74386b9..68cf40ca2 100644 --- a/trusty/keymaster/trusty_keymaster_device.h +++ b/trusty/keymaster/trusty_keymaster_device.h @@ -39,7 +39,7 @@ class TrustyKeymasterDevice { * These are the only symbols that will be exported by libtrustykeymaster. All functionality * can be reached via the function pointers in device_. */ - __attribute__((visibility("default"))) TrustyKeymasterDevice(const hw_module_t* module); + __attribute__((visibility("default"))) explicit TrustyKeymasterDevice(const hw_module_t* module); __attribute__((visibility("default"))) hw_device_t* hw_device(); ~TrustyKeymasterDevice(); |