Changeset 85647 in vbox for trunk

Timestamp:

Aug 8, 2020 12:16:31 PM (4 years ago)

Author:

vboxsync

Message:

iprt/cdefs.h: VS2010 refuses to do nothrow on typedefs, so no nothrow for it. bugref:9794

File:

• trunk/include/iprt/cdefs.h (modified) (4 diffs)

trunk/include/iprt/cdefs.h

@@ -1104 +1104 @@
  */
 #ifdef __cplusplus
-# ifdef _MSC_VER
+# if RT_MSC_PREREQ(RT_MSC_VER_VS2015) /*?*/
 #  define DECL_NOTHROW(a_Type)      __declspec(nothrow) a_Type
 # elif RT_CLANG_PREREQ(6,0) || RT_GNUC_PREREQ(4,2)
@@ -1531 +1531 @@
 #if RT_CLANG_PREREQ(6,0)
 # define DECLCALLBACKTYPE_EX(a_RetType, a_CallConv, a_Name, a_Args) __attribute__((__nothrow__)) a_RetType a_CallConv a_Name a_Args
-#elif defined(_MSC_VER) && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
+#elif RT_MSC_PREREQ(RT_MSC_VER_VS2015) /*?*/ && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
 # define DECLCALLBACKTYPE_EX(a_RetType, a_CallConv, a_Name, a_Args) a_RetType a_CallConv a_Name a_Args throw()
 #else
@@ -1557 +1557 @@
 #elif RT_CLANG_PREREQ(6,0)
 # define DECLCALLBACKPTR_EX(a_RetType, a_CallConv, a_Name, a_Args) __attribute__((__nothrow__)) a_RetType (a_CallConv * a_Name) a_Args
-#elif defined(_MSC_VER) && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
+#elif RT_MSC_PREREQ(RT_MSC_VER_VS2015) /*?*/ && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
 # define DECLCALLBACKPTR_EX(a_RetType, a_CallConv, a_Name, a_Args) a_RetType (a_CallConv * a_Name) a_Args throw()
 #else
@@ -1583 +1583 @@
 #elif RT_CLANG_PREREQ(6,0)
 # define DECLCALLBACKMEMBER_EX(a_RetType, a_CallConv, a_Name, a_Args) __attribute__((__nothrow__)) a_RetType (a_CallConv *a_Name) a_Args
-#elif defined(_MSC_VER) && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
+#elif RT_MSC_PREREQ(RT_MSC_VER_VS2015) /*?*/ && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
 # define DECLCALLBACKMEMBER_EX(a_RetType, a_CallConv, a_Name, a_Args) a_RetType (a_CallConv *a_Name) a_Args throw()
 #else