diff options
Diffstat (limited to 'ACE/ace/config-win32-msvc-8.h')
| -rw-r--r-- | ACE/ace/config-win32-msvc-8.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h index 61a0858bedb..3ad89528ae8 100644 --- a/ACE/ace/config-win32-msvc-8.h +++ b/ACE/ace/config-win32-msvc-8.h @@ -54,10 +54,12 @@ #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#define ACE_HAS_EXCEPTIONS +#ifndef ACE_HAS_EXCEPTIONS +# define ACE_HAS_EXCEPTIONS +#endif // Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. -// This has been true up thrugh the versions. We don't have any indication +// This has been true up thrugh the versions. We don't have any indication // that this might be supported in the future, but it is an easy enough fix // to bump the wince revision number when a new version is released. # if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) @@ -117,7 +119,13 @@ // Maybe in the future. // Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) +#pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +// 'this' : used in base member initializer list +#pragma warning(disable:4355) // CE (at least thru Windows Mobile 5) doesn't have the new, secure CRT. #if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_TR24731_2005_CRT) |