From d7b82e48cfd0e5dfc8ac1e1c3916ae926fe1a59d Mon Sep 17 00:00:00 2001 From: berryplus Date: Sat, 1 Sep 2018 00:21:17 +0900 Subject: [PATCH 1/2] =?UTF-8?q?delete=E3=81=AE=E3=82=AA=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=AD=E3=83=BC=E3=83=89=E3=81=8CGCC=E3=81=AB?= =?UTF-8?q?=E6=80=92=E3=82=89=E3=82=8C=E3=82=8B=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/config/build_config.cpp | 4 ++-- sakura_core/config/build_config.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sakura_core/config/build_config.cpp b/sakura_core/config/build_config.cpp index ed53aec770..82cff965b9 100644 --- a/sakura_core/config/build_config.cpp +++ b/sakura_core/config/build_config.cpp @@ -35,12 +35,12 @@ void* operator new[](size_t nSize) return p; } -void operator delete(void* p) +void operator delete(void* p) noexcept { ::free(p); } -void operator delete[](void* p) +void operator delete[](void* p) noexcept { ::free(p); } diff --git a/sakura_core/config/build_config.h b/sakura_core/config/build_config.h index 089792962c..ac5a89e71b 100644 --- a/sakura_core/config/build_config.h +++ b/sakura_core/config/build_config.h @@ -67,7 +67,7 @@ static const bool UNICODE_BOOL=false; //newされた領域をわざと汚すかどうか (デバッグ用) #ifdef _DEBUG -#define FILL_STRANGE_IN_NEW_MEMORY +# define FILL_STRANGE_IN_NEW_MEMORY #endif @@ -95,8 +95,8 @@ static const bool UNICODE_BOOL=false; #endif #endif void* operator new[](size_t nSize); - void operator delete(void* p); - void operator delete[](void* p); + void operator delete(void* p) noexcept; + void operator delete[](void* p) noexcept; #endif From 2e83cc32e70ab928ddc7ef42afce4eaaa5159c45 Mon Sep 17 00:00:00 2001 From: berryplus Date: Wed, 5 Sep 2018 21:46:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?= =?UTF-8?q?=E6=8C=87=E6=91=98=E4=BF=AE=E6=AD=A3=EF=BC=9A=E3=80=80#define?= =?UTF-8?q?=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3=E3=83=88=E3=82=92?= =?UTF-8?q?=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/config/build_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_core/config/build_config.h b/sakura_core/config/build_config.h index ac5a89e71b..7e3e726f50 100644 --- a/sakura_core/config/build_config.h +++ b/sakura_core/config/build_config.h @@ -67,7 +67,7 @@ static const bool UNICODE_BOOL=false; //newされた領域をわざと汚すかどうか (デバッグ用) #ifdef _DEBUG -# define FILL_STRANGE_IN_NEW_MEMORY +#define FILL_STRANGE_IN_NEW_MEMORY #endif