Changeset 39088 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Oct 24, 2011 10:12:20 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

74520

Message:

alloc-ef-cpp.cpp: build fix.

File:

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

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

@@ -39 +39 @@
 /** @todo test this on MSC */
 
-/* MSC declares the operators as cdecl it seems. */
+/** MSC declares the operators as cdecl it seems. */
 #ifdef _MSC_VER
 # define RT_EF_CDECL    __cdecl
@@ -46 +46 @@
 #endif
 
-/* MSC doesn't use the standard namespace. */
+/** MSC doesn't use the standard namespace. */
 #ifdef _MSC_VER
 # define RT_EF_SIZE_T   size_t
@@ -53 +53 @@
 #endif
 
+/** 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
+# else
+#  define RT_EF_THROWS_BAD_ALLOC    throw(std::bad_alloc)
+# endif
+#else
+# define RT_EF_THROWS_BAD_ALLOC     throw(std::bad_alloc)
+#endif
 
-void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb) throw(std::bad_alloc)
+
+void *RT_EF_CDECL operator new(RT_EF_SIZE_T cb) RT_EF_THROWS_BAD_ALLOC
 {
     void *pv = rtR3MemAlloc("new", RTMEMTYPE_NEW, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);
@@ -90 +101 @@
  */
 
-void *RT_EF_CDECL operator new[](RT_EF_SIZE_T cb) throw(std::bad_alloc)
+void *RT_EF_CDECL operator new[](RT_EF_SIZE_T cb) RT_EF_THROWS_BAD_ALLOC
 {
     void *pv = rtR3MemAlloc("new[]", RTMEMTYPE_NEW_ARRAY, cb, cb, NULL, ASMReturnAddress(), NULL, 0, NULL);