Changeset 57434 in vbox for trunk/src/VBox/Runtime

Timestamp:

Aug 18, 2015 3:14:45 PM (9 years ago)

Author:

vboxsync

Message:

build fix

File:

• trunk/src/VBox/Runtime/r3/alloc-ef-cpp.cpp (modified) (8 diffs)

trunk/src/VBox/Runtime/r3/alloc-ef-cpp.cpp

@@ -58 +58 @@
 # ifdef _MSC_VER
 #  define RT_EF_THROWS_BAD_ALLOC
+#  define RT_EF_NOTHROW               RT_NO_THROW_DEF
 # else
 #  ifdef _GLIBCXX_THROW
@@ -64 +65 @@
 #   define RT_EF_THROWS_BAD_ALLOC     throw(std::bad_alloc)
 #  endif
+#  define RT_EF_NOTHROW               throw()
 # endif
 #else  /* !RT_EXCEPTIONS_ENABLED */
 # define RT_EF_THROWS_BAD_ALLOC
+# define RT_EF_NOTHROW
 #endif /* !RT_EXCEPTIONS_ENABLED */
 
@@ -79 +82 @@
 
 
-void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb, const std::nothrow_t &) RT_NO_THROW_DEF
+void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb, const std::nothrow_t &) RT_EF_NOTHROW
 {
     void *pv = rtR3MemAlloc("new nothrow", RTMEMTYPE_NEW, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
@@ -86 +89 @@
 
 
-void RT_EF_CDECL operator delete(void *pv) RT_NO_THROW_DEF
+void RT_EF_CDECL operator delete(void *pv) RT_EF_NOTHROW
 {
     rtR3MemFree("delete", RTMEMTYPE_DELETE, pv, ASMReturnAddress(), NULL, 0, NULL);
@@ -92 +95 @@
 
 
-void RT_EF_CDECL operator delete(void * pv, const std::nothrow_t &) RT_NO_THROW_DEF
+void RT_EF_CDECL operator delete(void * pv, const std::nothrow_t &) RT_EF_NOTHROW
 {
     rtR3MemFree("delete nothrow", RTMEMTYPE_DELETE, pv, ASMReturnAddress(), NULL, 0, NULL);
@@ -115 +118 @@
 
 
-void * RT_EF_CDECL operator new[](RT_EF_SIZE_T cb, const std::nothrow_t &) RT_NO_THROW_DEF
+void * RT_EF_CDECL operator new[](RT_EF_SIZE_T cb, const std::nothrow_t &) RT_EF_NOTHROW
 {
     void *pv = rtR3MemAlloc("new[] nothrow", RTMEMTYPE_NEW_ARRAY, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
@@ -122 +125 @@
 
 
-void RT_EF_CDECL operator delete[](void * pv) RT_NO_THROW_DEF
+void RT_EF_CDECL operator delete[](void * pv) RT_EF_NOTHROW
 {
     rtR3MemFree("delete[]", RTMEMTYPE_DELETE_ARRAY, pv, ASMReturnAddress(), NULL, 0, NULL);
@@ -128 +131 @@
 
 
-void RT_EF_CDECL operator delete[](void *pv, const std::nothrow_t &) RT_NO_THROW_DEF
+void RT_EF_CDECL operator delete[](void *pv, const std::nothrow_t &) RT_EF_NOTHROW
 {
     rtR3MemFree("delete[] nothrow", RTMEMTYPE_DELETE_ARRAY, pv, ASMReturnAddress(), NULL, 0, NULL);