lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 25.0.3+dfsg1

Browse source
This commit is contained in:
Sebastian Ramacher 2020-03-25 09:07:22 +01:00
parent 04fe0efc67
commit 8b2e5f2130
569 changed files with 62491 additions and 5875 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libobs/util/util.hpp
View file

@ -20,6 +20,7 @@
#include <string.h>
#include <stdarg.h>
#include <utility>
#include "bmem.h"
#include "config-file.h"
@ -36,7 +37,7 @@ template<typename T> class BPtr {
public:
inline BPtr(T *p = nullptr) : ptr(p) {}
inline BPtr(BPtr &&other) : ptr(other.ptr) { other.ptr = nullptr; }
inline BPtr(BPtr &&other) { *this = std::move(other); }
inline ~BPtr() { bfree(ptr); }
inline T *operator=(T *p)
@ -45,6 +46,14 @@ public:
ptr = p;
return p;
}
inline BPtr &operator=(BPtr &&other)
{
ptr = other.ptr;
other.ptr = nullptr;
return *this;
}
inline operator T *() { return ptr; }
inline T **operator&()
{
@ -68,7 +77,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 +129,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;
}