From 087411f4cb3ffcb3d0fbcb58eb0079b188b8f6c7 Mon Sep 17 00:00:00 2001 From: Adeel Date: Thu, 26 Mar 2020 17:29:03 +0000 Subject: [PATCH] Move __allocator under PAL_STDCPP_COMPAT --- src/coreclr/src/pal/inc/rt/specstrings.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/coreclr/src/pal/inc/rt/specstrings.h b/src/coreclr/src/pal/inc/rt/specstrings.h index 567d1e1fe5999e..0a6397eb75dbed 100644 --- a/src/coreclr/src/pal/inc/rt/specstrings.h +++ b/src/coreclr/src/pal/inc/rt/specstrings.h @@ -310,8 +310,8 @@ __ANNOTATION(SAL_failureDefault(enum __SAL_failureKind)); __byte_readableTo((expr) ? (size) : (size) * 2) #define __post_invalid _Post_ __notvalid /* integer related macros */ -#define __allocator __inner_allocator #ifndef PAL_STDCPP_COMPAT +#define __allocator __inner_allocator #define __deallocate(kind) _Pre_ __notnull __post_invalid #define __deallocate_opt(kind) _Pre_ __maybenull __post_invalid #endif