diff options
| author | Roman Kovalivskyi <roman.kovalivskyi@globallogic.com> | 2019-11-25 19:13:05 +0200 |
|---|---|---|
| committer | Roman Kovalivskyi <roman.kovalivskyi@globallogic.com> | 2019-11-28 13:01:15 +0000 |
| commit | e606a62848a58dc0f8b0881843d7122d986a4f30 (patch) | |
| tree | 609294453c586d47b6196ef7cd2dd3617096c482 | |
| parent | 6f5e450d50952e5354bafabae7b4001dbf4c35eb (diff) | |
drm_hwcomposer: Fix compilation issues with Android 9
It appears that class template argument deduction is unavailable on
all target platform compilers, therefore it would be better to come
back to explicit template parameters.
Signed-off-by: Roman Kovalivskyi <roman.kovalivskyi@globallogic.com>
| -rw-r--r-- | drm/drmconnector.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drm/drmconnector.cpp b/drm/drmconnector.cpp index bca7575..2c0adda 100644 --- a/drm/drmconnector.cpp +++ b/drm/drmconnector.cpp @@ -30,6 +30,8 @@ namespace android { +constexpr size_t TYPES_COUNT = 17; + DrmConnector::DrmConnector(DrmDevice *drm, drmModeConnectorPtr c, DrmEncoder *current_encoder, std::vector<DrmEncoder *> &possible_encoders) @@ -117,11 +119,10 @@ bool DrmConnector::valid_type() const { } std::string DrmConnector::name() const { - constexpr std::array names = {"None", "VGA", "DVI-I", "DVI-D", - "DVI-A", "Composite", "SVIDEO", "LVDS", - "Component", "DIN", "DP", "HDMI-A", - "HDMI-B", "TV", "eDP", "Virtual", - "DSI"}; + constexpr std::array<const char *, TYPES_COUNT> names = + {"None", "VGA", "DVI-I", "DVI-D", "DVI-A", "Composite", + "SVIDEO", "LVDS", "Component", "DIN", "DP", "HDMI-A", + "HDMI-B", "TV", "eDP", "Virtual", "DSI"}; std::ostringstream name_buf; name_buf << names[type_] << "-" << type_id_; |