merge patch of issue #257

zlgopen · Oct 30, 2019 · ce27844 · ce27844
1 parent 5c8b426
commit ce27844
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/docs/changes.md b/docs/changes.md
@@ -5,6 +5,7 @@
   * 修改文档中的错误（感谢俊杰提供补丁）。
   * 更新awtk config sample。
   * 修改软键盘弹出时出现屏保的问题。
+  * 完善new.cpp/new.hpp （感谢陈谭提供补丁）。
 
 * 2019/10/23
   * 修改clone出来的edit的显示问题。

diff --git a/src/misc/new.cpp b/src/misc/new.cpp
@@ -4,15 +4,15 @@
 
 #ifndef HAS_STD_MALLOC
 
-void* operator new(std::size_t size) throw(std::bad_alloc) {
+void* operator new(std::size_t size) __TK_THROW_BAD_ALLOC {
   if (size >= MAX_SIZE) {
     log_debug("size is too large\n");
   }
 
   return TKMEM_ALLOC(size);
 }
 
-void* operator new[](std::size_t size) throw(std::bad_alloc) {
+void* operator new[](std::size_t size) __TK_THROW_BAD_ALLOC {
   if (size >= MAX_SIZE) {
     log_debug("size is too large\n");
   }

diff --git a/src/misc/new.hpp b/src/misc/new.hpp
@@ -7,9 +7,15 @@
 
 #ifndef HAS_STD_MALLOC
 
-void* operator new(std::size_t size) throw(std::bad_alloc);
+#if __cplusplus < 201103L || defined(__ARMCC_VERSION)
+#define __TK_THROW_BAD_ALLOC throw(std::bad_alloc)
+#else
+#define __TK_THROW_BAD_ALLOC
+#endif
 
-void* operator new[](std::size_t size) throw(std::bad_alloc);
+void* operator new(std::size_t size) __TK_THROW_BAD_ALLOC;
+
+void* operator new[](std::size_t size) __TK_THROW_BAD_ALLOC;
 
 void  operator delete(void* obj) throw();