diff --git a/frameworks/ani/input_consumer/src/input_consumer.cpp b/frameworks/ani/input_consumer/src/input_consumer.cpp index 1bd3174fbc2a159d978938af56c7cd074dad4380..1e4fa3b16557420f42e2af8366c13a2b3dc72a67 100644 --- a/frameworks/ani/input_consumer/src/input_consumer.cpp +++ b/frameworks/ani/input_consumer/src/input_consumer.cpp @@ -35,7 +35,7 @@ const double INT32_MAX_D = static_cast(std::numeric_limits::max } // namespace static Callbacks callbacks = {}; -std::mutex sCallBacksMutex; +static std::mutex sCallBacksMutex; KeyEventMonitorInfo::~KeyEventMonitorInfo() { diff --git a/frameworks/ani/input_device/src/ani_input_device_context.cpp b/frameworks/ani/input_device/src/ani_input_device_context.cpp index 40a641c7e43c44d3c3aae41e9dcf50b5122608f4..4e430ecfc66a91453d8b0e9d0634b7ca75f1e4a9 100644 --- a/frameworks/ani/input_device/src/ani_input_device_context.cpp +++ b/frameworks/ani/input_device/src/ani_input_device_context.cpp @@ -36,7 +36,7 @@ using namespace OHOS::MMI; -std::unordered_map axisType = { +static std::unordered_map axisType = { { ABS_MT_TOUCH_MAJOR, "touchmajor" }, { ABS_MT_TOUCH_MINOR, "touchminor" }, { ABS_MT_ORIENTATION, "orientation" }, { ABS_MT_POSITION_X, "x" }, { ABS_MT_POSITION_Y, "y" }, { ABS_MT_PRESSURE, "pressure" }, { ABS_MT_WIDTH_MAJOR, "toolmajor" }, { ABS_MT_WIDTH_MINOR, "toolminor" }, @@ -47,7 +47,7 @@ constexpr uint32_t EVDEV_UDEV_TAG_TOUCHSCREEN = (1 << 4); constexpr uint32_t EVDEV_UDEV_TAG_JOYSTICK = (1 << 6); constexpr uint32_t EVDEV_UDEV_TAG_TRACKBALL = (1 << 10); -AniUtil::DeviceType g_deviceType[] = { +static AniUtil::DeviceType g_deviceType[] = { { "keyboard", EVDEV_UDEV_TAG_KEYBOARD }, { "mouse", EVDEV_UDEV_TAG_MOUSE }, { "touchpad", EVDEV_UDEV_TAG_TOUCHPAD }, diff --git a/frameworks/ani/pointer/src/pointer.cpp b/frameworks/ani/pointer/src/pointer.cpp index 4c6cca56ea87d038a0ddcd1e99d76f370723c4a6..7f2bca2f8aa073ccb8168468c351cb7a81869dae 100644 --- a/frameworks/ani/pointer/src/pointer.cpp +++ b/frameworks/ani/pointer/src/pointer.cpp @@ -66,7 +66,7 @@ static ani_error CreateAniError(ani_env *env, std::string&& errMsg) return static_cast(errorObject); } -int32_t ToInt32ECMAScript(double value) +static int32_t ToInt32ECMAScript(double value) { if (std::isnan(value) || std::isinf(value)) { return 0;