From d5e810f2b8f7ff8d95cc739dc1df1250a340a2da Mon Sep 17 00:00:00 2001 From: Hugo Saint-Vignes Date: Thu, 29 Oct 2020 15:31:13 +0100 Subject: [PATCH] [ion/shared] Remove contexpr array definition in header Change-Id: I620e977b000ee53c3db97510e666dfda30f4db30 --- ion/include/ion/keyboard/event_data.h | 3 +-- ion/src/shared/events.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ion/include/ion/keyboard/event_data.h b/ion/include/ion/keyboard/event_data.h index 58037d721..017711051 100644 --- a/ion/include/ion/keyboard/event_data.h +++ b/ion/include/ion/keyboard/event_data.h @@ -7,12 +7,11 @@ namespace Events { class EventData { public: static constexpr EventData Undefined() { return EventData(nullptr); } - static constexpr EventData Textless() { return EventData(k_textless); } + static constexpr EventData Textless() { return EventData(""); } static constexpr EventData Text(const char * text) { return EventData(text); } bool isDefined() const { return (m_data != nullptr); } const char * text() const; private: - static constexpr const char * k_textless = ""; constexpr EventData(const char * data) : m_data(data) {} const char * m_data; }; diff --git a/ion/src/shared/events.cpp b/ion/src/shared/events.cpp index 7346afd09..e74130efc 100644 --- a/ion/src/shared/events.cpp +++ b/ion/src/shared/events.cpp @@ -9,7 +9,7 @@ namespace Ion { namespace Events { const char * EventData::text() const { - if (m_data == nullptr || m_data == k_textless) { + if (m_data == nullptr || m_data[0] == 0) { return nullptr; } return m_data;