diff --git a/libobs-d3d11/d3d11-subsystem.hpp b/libobs-d3d11/d3d11-subsystem.hpp index 80bb5fd7f..89d04969f 100644 --- a/libobs-d3d11/d3d11-subsystem.hpp +++ b/libobs-d3d11/d3d11-subsystem.hpp @@ -17,7 +17,6 @@ #pragma once -#include #include #include diff --git a/libobs/CMakeLists.txt b/libobs/CMakeLists.txt index d46a830c2..5c77396f5 100644 --- a/libobs/CMakeLists.txt +++ b/libobs/CMakeLists.txt @@ -331,7 +331,6 @@ set(public_headers obs-source.h obs.h obs.hpp - util/AlignedNew.hpp util/apple/cfstring-utils.h util/array-serializer.h util/base.h diff --git a/libobs/util/AlignedNew.hpp b/libobs/util/AlignedNew.hpp deleted file mode 100644 index 04261a548..000000000 --- a/libobs/util/AlignedNew.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2023 Lain Bailey - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#pragma once - -#include "bmem.h" - -inline void *operator new(size_t size) -{ - return bmalloc(size); -} - -inline void operator delete(void *data) -{ - bfree(data); -} - -inline void *operator new[](size_t size) -{ - return bmalloc(size); -} - -inline void operator delete[](void *data) -{ - bfree(data); -}