summaryrefslogtreecommitdiff
path: root/include/input/KeyCharacterMap.h
diff options
context:
space:
mode:
author Chih-hung Hsieh <chh@google.com> 2018-12-21 22:31:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-12-21 22:31:24 +0000
commitaad7e1ccc57ea46bbe2af1b40d3a308340234b5e (patch)
treeaaf5e8bfc9ff658d36c7494d9e427b6814b3441c /include/input/KeyCharacterMap.h
parent7a4ecaaf0df4bcf6618e70610dde64e25a5a3198 (diff)
parentf43b02c408d0b6afb958c9d426480dd1b615820b (diff)
Merge "Fix/suppress google-explicit-constructor warnings"
Diffstat (limited to 'include/input/KeyCharacterMap.h')
-rw-r--r--include/input/KeyCharacterMap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/input/KeyCharacterMap.h b/include/input/KeyCharacterMap.h
index 33d2757ec8..5e542b87ec 100644
--- a/include/input/KeyCharacterMap.h
+++ b/include/input/KeyCharacterMap.h
@@ -196,7 +196,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;