Merge pull request sakura-editor#386 from berryzplus/feature/upgrade_…

…delete_signature deleteのオーバーロードがGCCに怒られる対応
HoppingTappy · Sep 24, 2018 · 1880868 · 1880868
2 parents b978d59 + 2e83cc3
commit 1880868
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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