Changeset 39089 in vbox

Timestamp:

Oct 24, 2011 12:04:14 PM (13 years ago)

Author:

vboxsync

Message:

alloc-ef-cpp.cpp: Another build fix...

File:

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

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

@@ -54 +54 @@
 
 /** The hint that we're throwing std::bad_alloc is not apprecitated by MSC. */
-#ifdef _MSC_VER
-# if _MSC_VER >= 1400
-#  define RT_EF_THROWS_BAD_ALLOC
+#ifdef RT_EXCEPTIONS_ENABLED
+# ifdef _MSC_VER
+#  if _MSC_VER >= 1400
+#   define RT_EF_THROWS_BAD_ALLOC
+#  else
+#   define RT_EF_THROWS_BAD_ALLOC    throw(std::bad_alloc)
+#  endif
 # else
-#  define RT_EF_THROWS_BAD_ALLOC    throw(std::bad_alloc)
+#  define RT_EF_THROWS_BAD_ALLOC     throw(std::bad_alloc)
 # endif
-#else
-# define RT_EF_THROWS_BAD_ALLOC     throw(std::bad_alloc)
-#endif
+#else  /* !RT_EXCEPTIONS_ENABLED */
+# define RT_EF_THROWS_BAD_ALLOC
+#endif /* !RT_EXCEPTIONS_ENABLED */
 
 
@@ -74 +78 @@
 
 
-void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb, const std::nothrow_t &) throw()
+void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb, const std::nothrow_t &) RT_NO_THROW
 {
     void *pv = rtR3MemAlloc("new nothrow", RTMEMTYPE_NEW, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
@@ -81 +85 @@
 
 
-void RT_EF_CDECL operator delete(void *pv) throw()
+void RT_EF_CDECL operator delete(void *pv) RT_NO_THROW
 {
     rtR3MemFree("delete", RTMEMTYPE_DELETE, pv, ASMReturnAddress(), NULL, 0, NULL);
@@ -87 +91 @@
 
 
-void RT_EF_CDECL operator delete(void * pv, const std::nothrow_t &) throw()
+void RT_EF_CDECL operator delete(void * pv, const std::nothrow_t &) RT_NO_THROW
 {
     rtR3MemFree("delete nothrow", RTMEMTYPE_DELETE, pv, ASMReturnAddress(), NULL, 0, NULL);
@@ -110 +114 @@
 
 
-void * RT_EF_CDECL operator new[](RT_EF_SIZE_T cb, const std::nothrow_t &) throw()
+void * RT_EF_CDECL operator new[](RT_EF_SIZE_T cb, const std::nothrow_t &) RT_NO_THROW
 {
     void *pv = rtR3MemAlloc("new[] nothrow", RTMEMTYPE_NEW_ARRAY, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
@@ -117 +121 @@
 
 
-void RT_EF_CDECL operator delete[](void * pv) throw()
+void RT_EF_CDECL operator delete[](void * pv) RT_NO_THROW
 {
     rtR3MemFree("delete[]", RTMEMTYPE_DELETE_ARRAY, pv, ASMReturnAddress(), NULL, 0, NULL);
@@ -123 +127 @@
 
 
-void RT_EF_CDECL operator delete[](void *pv, const std::nothrow_t &) throw()
+void RT_EF_CDECL operator delete[](void *pv, const std::nothrow_t &) RT_NO_THROW
 {
     rtR3MemFree("delete[] nothrow", RTMEMTYPE_DELETE_ARRAY, pv, ASMReturnAddress(), NULL, 0, NULL);