From c2186fa55bb669bc0074abe06b317a2aca38ffd2 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Thu, 20 May 2021 14:05:36 +0200
Subject: [PATCH] Use the std::derived_from concept when applicable

This probably makes things much clearer at a glance instead of using a
blanked typename.
---
 src/common/communication/vst2.h | 4 ++--
 src/plugin/bridges/vst2.cpp     | 2 +-
 src/wine-host/bridges/vst2.cpp  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/common/communication/vst2.h b/src/common/communication/vst2.h
index 9d899ff6..ce9bd4d4 100644
--- a/src/common/communication/vst2.h
+++ b/src/common/communication/vst2.h
@@ -152,8 +152,8 @@ class Vst2EventHandler : public AdHocSocketHandler<Thread> {
      * @relates Vst2EventHandler::receive_events
      * @relates passthrough_event
      */
-    template <typename D>
-    intptr_t send_event(D& data_converter,
+    template <std::derived_from<DefaultDataConverter> Converter>
+    intptr_t send_event(Converter& data_converter,
                         std::optional<std::pair<Vst2Logger&, bool>> logging,
                         int opcode,
                         int index,
diff --git a/src/plugin/bridges/vst2.cpp b/src/plugin/bridges/vst2.cpp
index 1b044417..fea0ee1b 100644
--- a/src/plugin/bridges/vst2.cpp
+++ b/src/plugin/bridges/vst2.cpp
@@ -183,7 +183,7 @@ Vst2PluginBridge::~Vst2PluginBridge() noexcept {
     }
 }
 
-class DispatchDataConverter : DefaultDataConverter {
+class DispatchDataConverter : public DefaultDataConverter {
    public:
     DispatchDataConverter(std::vector<uint8_t>& chunk_data,
                           AEffect& plugin,
diff --git a/src/wine-host/bridges/vst2.cpp b/src/wine-host/bridges/vst2.cpp
index 3fdf061a..f76cef9c 100644
--- a/src/wine-host/bridges/vst2.cpp
+++ b/src/wine-host/bridges/vst2.cpp
@@ -486,7 +486,7 @@ intptr_t Vst2Bridge::dispatch_wrapper(AEffect* plugin,
     }
 }
 
-class HostCallbackDataConverter : DefaultDataConverter {
+class HostCallbackDataConverter : public DefaultDataConverter {
    public:
     HostCallbackDataConverter(AEffect* plugin,
                               VstTimeInfo& last_time_info) noexcept