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>
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 @@
}
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_;