Skip to content

Fix MacOS build #7009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhuanjl merged 1 commit into from
Feb 22, 2025
Merged

Fix MacOS build #7009

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/Common/Memory/Allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//-------------------------------------------------------------------------------------------------------
// Copyright (C) Microsoft. All rights reserved.
// Copyright (c) ChakraCore Project Contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
//-------------------------------------------------------------------------------------------------------
#pragma once
Expand Down Expand Up @@ -448,6 +449,8 @@ void AssertValue(void * mem, T value, uint byteCount)
#define NO_EXPORT(x) x
#endif

#if defined(_MSC_VER) && !defined(__clang__)

// For the debugger extension, we don't need the placement news
#ifndef __PLACEMENT_NEW_INLINE
#define __PLACEMENT_NEW_INLINE
Expand All @@ -473,6 +476,14 @@ void * previousAllocation // Previously allocated memory

#endif

#else

// Use std inline placement new instead of custom
// See PR #7009
#include <new>

#endif

//----------------------------------------
// throwing operator new overrides
//----------------------------------------
Expand Down
Loading