From dd9a55ecc0d9d04d24de362895ebae6b8c6aa654 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 14 Oct 2019 01:42:07 +0200 Subject: [PATCH] [util] Don't allow multiple inheritance for COM objects This never made any sense whatsoever in the first place. --- src/d3d11/d3d11_device_child.h | 4 ++-- src/dxgi/dxgi_object.h | 4 ++-- src/util/com/com_object.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/d3d11/d3d11_device_child.h b/src/d3d11/d3d11_device_child.h index 190b5afa7..facb901fe 100644 --- a/src/d3d11/d3d11_device_child.h +++ b/src/d3d11/d3d11_device_child.h @@ -6,8 +6,8 @@ namespace dxvk { - template - class D3D11DeviceChild : public ComObject { + template + class D3D11DeviceChild : public ComObject { public: diff --git a/src/dxgi/dxgi_object.h b/src/dxgi/dxgi_object.h index 4213d8921..aac2bb4cc 100644 --- a/src/dxgi/dxgi_object.h +++ b/src/dxgi/dxgi_object.h @@ -6,8 +6,8 @@ namespace dxvk { - template - class DxgiObject : public ComObject { + template + class DxgiObject : public ComObject { public: diff --git a/src/util/com/com_object.h b/src/util/com/com_object.h index 8bb8c48d6..ab8d8b6f5 100644 --- a/src/util/com/com_object.h +++ b/src/util/com/com_object.h @@ -24,8 +24,8 @@ namespace dxvk { * holding on to objects which the application wants * to delete. */ - template - class ComObject : public Base... { + template + class ComObject : public Base { public: