From ef76e353d35c024665e3e0aeea2d9ebbc1b74799 Mon Sep 17 00:00:00 2001 From: Michael Fabian 'Xaymar' Dirks Date: Sun, 15 Dec 2019 10:37:41 +0100 Subject: [PATCH] gs-effect-pass/technique: Change to protected inheritance Prevents the use of get() and reset() where not actually needed and forces us to actually implement all of the methods needed to interface with the object, leading to cleaner and safer code. --- source/obs/gs/gs-effect-pass.hpp | 2 +- source/obs/gs/gs-effect-technique.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/obs/gs/gs-effect-pass.hpp b/source/obs/gs/gs-effect-pass.hpp index 5c0ea854..c558b6a8 100644 --- a/source/obs/gs/gs-effect-pass.hpp +++ b/source/obs/gs/gs-effect-pass.hpp @@ -25,7 +25,7 @@ #include namespace gs { - class effect_pass : public std::shared_ptr { + class effect_pass : protected std::shared_ptr { std::shared_ptr* _parent; public: diff --git a/source/obs/gs/gs-effect-technique.hpp b/source/obs/gs/gs-effect-technique.hpp index acc412b7..d5e2780c 100644 --- a/source/obs/gs/gs-effect-technique.hpp +++ b/source/obs/gs/gs-effect-technique.hpp @@ -26,7 +26,7 @@ #include namespace gs { - class effect_technique : public std::shared_ptr { + class effect_technique : protected std::shared_ptr { std::shared_ptr* _parent; public: