diff --git a/deps/ox/src/ox/std/new.cpp b/deps/ox/src/ox/std/new.cpp deleted file mode 100644 index d68c833e..00000000 --- a/deps/ox/src/ox/std/new.cpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2015 - 2018 gtalent2@gmail.com - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef OX_USE_STDLIB - -#include "types.hpp" - -void *operator new(std::size_t, void *addr) noexcept { - return addr; -} - -void *operator new[](std::size_t, void *addr) noexcept { - return addr; -} - -#endif diff --git a/deps/ox/src/ox/std/new.hpp b/deps/ox/src/ox/std/new.hpp index c958411e..0eae97b3 100644 --- a/deps/ox/src/ox/std/new.hpp +++ b/deps/ox/src/ox/std/new.hpp @@ -1,5 +1,5 @@ /* - * Copyright 2015 - 2018 gtalent2@gmail.com + * Copyright 2015 - 2020 gtalent2@gmail.com * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -25,7 +25,13 @@ #if __has_include() #include #else -void *operator new(std::size_t, void*) noexcept; +constexpr void *operator new(std::size_t, void *addr) noexcept { + return addr; +} + +constexpr void *operator new[](std::size_t, void *addr) noexcept { + return addr; +} #endif