Просмотр исходного кода

libobs-d3d11: Remove new/delete replacements

MSVC noticed inline is not allowed, and new/delete replacments also
don't belong in a header file. We're also just leaning on
__STDCPP_DEFAULT_NEW_ALIGNMENT__ being 16 for MSVC x64 now.
jpark37 1 год назад
Родитель
Сommit
a8866fe3fa
3 измененных файлов с 0 добавлено и 41 удалено
  1. 0 1
      libobs-d3d11/d3d11-subsystem.hpp
  2. 0 1
      libobs/CMakeLists.txt
  3. 0 39
      libobs/util/AlignedNew.hpp

+ 0 - 1
libobs-d3d11/d3d11-subsystem.hpp

@@ -17,7 +17,6 @@
 
 #pragma once
 
-#include <util/AlignedNew.hpp>
 #include <util/windows/win-version.h>
 
 #include <vector>

+ 0 - 1
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

+ 0 - 39
libobs/util/AlignedNew.hpp

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2023 Lain Bailey <[email protected]>
- *
- * 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);
-}