Skip to content

Commit bd1057d

Browse files
committed
Squashed 'avr/cores/MCUdude_corefiles/' changes from 172d7e3b..278334f4
278334f4 Merge pull request #33 from DrItanium/cpp17_support 7aaa2705 Add the extra delete operators introduced in C++14 git-subtree-dir: avr/cores/MCUdude_corefiles git-subtree-split: 278334f48f2d7049b323cd5fe3864727d8228475
1 parent ce2d7b8 commit bd1057d

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

new.cpp

+15
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,18 @@ void operator delete[](void * ptr) {
3434
free(ptr);
3535
}
3636

37+
38+
// C++14 introduces additional delete operators
39+
#if __cplusplus >= 201402L
40+
41+
void operator delete(void * ptr, size_t)
42+
{
43+
::operator delete(ptr);
44+
}
45+
46+
void operator delete[](void * ptr, size_t)
47+
{
48+
::operator delete(ptr);
49+
}
50+
51+
#endif // end language is C++14 or greater

new.h

+6
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,11 @@ void * operator new[](size_t size);
2626
void operator delete(void * ptr);
2727
void operator delete[](void * ptr);
2828

29+
// C++14 introduces additional delete operators
30+
#if __cplusplus >= 201402L
31+
void operator delete(void * ptr, size_t);
32+
void operator delete[](void * ptr, size_t);
33+
#endif // end language is C++14 or greater
34+
2935
#endif
3036

0 commit comments

Comments
 (0)