diff options
| author | 2018-12-21 15:02:18 -0800 | |
|---|---|---|
| committer | 2018-12-21 15:02:18 -0800 | |
| commit | 80109da9fde13fa27d0460486ae54a606bd7ffc4 (patch) | |
| tree | 30aa93acbead19e97a6cd201f72b80ac9713523d /include/input/KeyCharacterMap.h | |
| parent | 26ce864c655c436076febe1cad5825d4ca1cabdd (diff) | |
| parent | 76b5c6b244f2cb715c41a1a00c1fa7920f324414 (diff) | |
Merge "Fix/suppress google-explicit-constructor warnings" am: aad7e1ccc5 am: 9a55c7aba6
am: 76b5c6b244
Change-Id: Id48300ec04692d040625176ce953e1f21e0bc6ae
Diffstat (limited to 'include/input/KeyCharacterMap.h')
| -rw-r--r-- | include/input/KeyCharacterMap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/input/KeyCharacterMap.h b/include/input/KeyCharacterMap.h index 9f4559f53c..a1a32a63de 100644 --- a/include/input/KeyCharacterMap.h +++ b/include/input/KeyCharacterMap.h @@ -195,7 +195,7 @@ private: }; struct Property { - inline Property(int32_t property = 0, int32_t metaState = 0) : + inline explicit Property(int32_t property = 0, int32_t metaState = 0) : property(property), metaState(metaState) { } int32_t property; |