From d383efc06540cda227daebdcdfb0f4d8cfdfc2ad Mon Sep 17 00:00:00 2001 From: jpark37 Date: Thu, 19 Mar 2020 11:20:44 -0700 Subject: [PATCH] libobs: Handle noexcept warnings VC++ wants noexcept for move assignment operators, and move contructors. --- libobs/obs.hpp | 4 ++-- libobs/util/util.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libobs/obs.hpp b/libobs/obs.hpp index d73e719db..97d2e15cb 100644 --- a/libobs/obs.hpp +++ b/libobs/obs.hpp @@ -236,7 +236,7 @@ public: } OBSSignal(const OBSSignal &) = delete; - OBSSignal(OBSSignal &&other) + OBSSignal(OBSSignal &&other) noexcept : handler(other.handler), signal(other.signal), callback(other.callback), @@ -249,7 +249,7 @@ public: } OBSSignal &operator=(const OBSSignal &) = delete; - OBSSignal &operator=(OBSSignal &&other) + OBSSignal &operator=(OBSSignal &&other) noexcept { Disconnect(); diff --git a/libobs/util/util.hpp b/libobs/util/util.hpp index 1307c9fe6..572ec088c 100644 --- a/libobs/util/util.hpp +++ b/libobs/util/util.hpp @@ -68,7 +68,7 @@ class ConfigFile { public: inline ConfigFile() : config(NULL) {} - inline ConfigFile(ConfigFile &&other) : config(other.config) + inline ConfigFile(ConfigFile &&other) noexcept : config(other.config) { other.config = nullptr; } @@ -120,7 +120,7 @@ class TextLookup { public: inline TextLookup(lookup_t *lookup = nullptr) : lookup(lookup) {} - inline TextLookup(TextLookup &&other) : lookup(other.lookup) + inline TextLookup(TextLookup &&other) noexcept : lookup(other.lookup) { other.lookup = nullptr; }