From 1a2179ac5a4c8fee8936ddf085204ed6100f0327 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 28 Nov 2020 15:22:55 +0100 Subject: Cleanup Visual Studio support now that we only support Visual Studio 2015 or newer * ACE/ace/config-win32-msvc-10.h: * ACE/ace/config-win32-msvc-11.h: * ACE/ace/config-win32-msvc-12.h: * ACE/ace/config-win32-msvc-7.h: * ACE/ace/config-win32-msvc-8.h: * ACE/ace/config-win32-msvc-9.h: Deleted. * ACE/ace/Local_Tokens.cpp: * ACE/ace/Numeric_Limits.h: * ACE/ace/OS_NS_stdio.inl: * ACE/ace/OS_NS_sys_stat.h: * ACE/ace/Object_Manager.cpp: * ACE/ace/Select_Reactor_Base.inl: * ACE/ace/Svc_Conf_Lexer.cpp: * ACE/ace/WFMO_Reactor.cpp: * ACE/ace/checked_iterator.h: * ACE/ace/config-WinCE.h: * ACE/ace/config-lite.h: * ACE/ace/config-win32-msvc-14.h: * ACE/ace/config-win32-msvc.h: * ACE/apps/Gateway/Gateway/Event_Channel.cpp: --- ACE/ace/Local_Tokens.cpp | 4 +- ACE/ace/Numeric_Limits.h | 27 ------- ACE/ace/OS_NS_stdio.inl | 5 +- ACE/ace/OS_NS_sys_stat.h | 9 --- ACE/ace/Object_Manager.cpp | 9 ++- ACE/ace/Select_Reactor_Base.inl | 4 +- ACE/ace/Svc_Conf_Lexer.cpp | 4 +- ACE/ace/WFMO_Reactor.cpp | 4 +- ACE/ace/checked_iterator.h | 10 +-- ACE/ace/config-WinCE.h | 13 +--- ACE/ace/config-lite.h | 13 +--- ACE/ace/config-win32-msvc-10.h | 146 ------------------------------------- ACE/ace/config-win32-msvc-11.h | 30 -------- ACE/ace/config-win32-msvc-12.h | 30 -------- ACE/ace/config-win32-msvc-14.h | 119 +++++++++++++++++++++++++++++- ACE/ace/config-win32-msvc-7.h | 119 ------------------------------ ACE/ace/config-win32-msvc-8.h | 155 ---------------------------------------- ACE/ace/config-win32-msvc-9.h | 145 ------------------------------------- ACE/ace/config-win32-msvc.h | 15 ---- 19 files changed, 139 insertions(+), 722 deletions(-) delete mode 100644 ACE/ace/config-win32-msvc-10.h delete mode 100644 ACE/ace/config-win32-msvc-11.h delete mode 100644 ACE/ace/config-win32-msvc-12.h delete mode 100644 ACE/ace/config-win32-msvc-7.h delete mode 100644 ACE/ace/config-win32-msvc-8.h delete mode 100644 ACE/ace/config-win32-msvc-9.h (limited to 'ACE/ace') diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index 67ce73af55d..1a8aaac0ad1 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -1135,7 +1135,7 @@ ACE_Token_Proxy::name (void) const return this->token_->name (); } -#if defined (ACE_WIN32_VC8) +#if defined (_MSC_VER) # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ #endif @@ -1156,7 +1156,7 @@ ACE_Token_Proxy::ACE_Token_Proxy (const ACE_Token_Proxy &) { ACE_TRACE ("ACE_Token_Proxy::ACE_Token_Proxy"); } -#if defined (ACE_WIN32_VC8) +#if defined (_MSC_VER) # pragma warning (pop) #endif diff --git a/ACE/ace/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h index 187123f6a1c..d8e7ca6adf4 100644 --- a/ACE/ace/Numeric_Limits.h +++ b/ACE/ace/Numeric_Limits.h @@ -214,33 +214,6 @@ struct ACE_Numeric_Limits static T max (void) { return std::numeric_limits::max (); } }; -# if (defined (ACE_WIN64) && defined (_MSC_VER) && _MSC_VER <= 1310) \ - || defined (ACE_LACKS_NUMERIC_LIMITS_64_BIT_TYPES) -// The Microsoft Platform SDK does not provide std::numeric_limits<> -// specializations for 64 bit integers so we need to explicitly provide -// ACE_Numeric_Limits<> specializations to compensate for this -// deficiency. -// -// Unfortunately there is no way to tell if the platform SDK is being -// used so we specialize for the ACE_WIN64 + MSVC++ 7.1 case, which is -// the configuration that exhibits this problem. It also happens to -// be a fairly isolated configuration since 64-bit support in MSVC++ -// 7.1 was not very good to begin with. -template<> -struct ACE_Numeric_Limits -{ - static LONGLONG min (void) { return _I64_MIN; } - static LONGLONG max (void) { return _I64_MAX; } -}; - -template<> -struct ACE_Numeric_Limits -{ - static ULONGLONG min (void) { return 0; } - static ULONGLONG max (void) { return _UI64_MAX; } -}; -# endif /* ACE_WIN64 && _MSC_VER <= 1310 */ - #endif /* ACE_LACKS_NUMERIC_LIMITS */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index 57349ea9873..ca964dc9d83 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -1129,10 +1129,7 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) (defined (sun) && !(defined(_XOPEN_SOURCE) && (_XOPEN_VERSION-0==4))) || \ defined (ACE_HAS_DINKUM_STL) || defined (__DMC__) || \ defined (ACE_HAS_VSWPRINTF) || \ - (defined (ACE_WIN32_VC10) && !defined (ACE_HAS_WINCE)) || \ - (defined (ACE_WIN32_VC9) && !defined (ACE_HAS_WINCE)) || \ - (defined (ACE_WIN32_VC8) && !defined (ACE_HAS_WINCE) && \ - _MSC_FULL_VER > 140050000) + (defined (_MSC_VER) && !defined (ACE_HAS_WINCE)) // The XPG4/UNIX98/C99 signature of the wide-char sprintf has a // maxlen argument. Since this method doesn't supply one, pass in diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index cf6e99f3699..06a0862234a 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -41,9 +41,6 @@ typedef struct stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 # define ACE_WSTAT_FUNC_NAME ::_wstati64 # elif !defined (ACE_HAS_WINCE) && defined (_MSC_VER) -# if _MSC_VER >= 1400 -// For vc8 which has time_t as 64bit -// 64-bit file offsets, 64-bit time_t # if defined (ACE_MSVC_USES_DOUBLE_UNDERSCORE_STAT64) typedef struct __stat64 ACE_stat; # else @@ -51,12 +48,6 @@ typedef struct _stat64 ACE_stat; # endif # define ACE_STAT_FUNC_NAME ::_stat64 # define ACE_WSTAT_FUNC_NAME ::_wstat64 -# else -// For vc71 which has time_t as 32bit -typedef struct _stati64 ACE_stat; -# define ACE_STAT_FUNC_NAME ::_stati64 -# define ACE_WSTAT_FUNC_NAME ::_wstati64 -# endif /* _MSC_VER >= 1400 */ # elif defined (__MINGW32__) typedef struct _stati64 ACE_stat; # define ACE_STAT_FUNC_NAME ::_stati64 diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index eb4dc69ef89..1d3b986eca8 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -271,10 +271,9 @@ ACE_Object_Manager::init (void) // And this will catch all unhandled exceptions. SetUnhandledExceptionFilter (&ACE_UnhandledExceptionFilter); -# if (_MSC_VER >= 1400) // VC++ 8.0 and above // And this will stop the abort system call from being treated as a crash _set_abort_behavior( 0, _CALL_REPORTFAULT); -# endif + // Note the following fix was derived from that proposed by Jochen Kalmbach // http://blog.kalmbachnet.de/?postid=75 // See also: @@ -289,10 +288,10 @@ ACE_Object_Manager::init (void) // from calling SetUnhandledExceptionFilter() after we have done so above. // NOTE this only works for intel based windows builds. -# if (_MSC_VER >= 1400) \ +# if (_MSC_VER) \ || (__MINGW32_MAJOR_VERSION > 3) || \ ((__MINGW32_MAJOR_VERSION == 3) && \ - (__MINGW32_MINOR_VERSION >= 15)) // VC++ 8.0 and above || MingW32 >= 3.15 + (__MINGW32_MINOR_VERSION >= 15)) // VC++ || MingW32 >= 3.15 # ifdef _M_IX86 HMODULE hKernel32 = ACE_TEXT_LoadLibrary (ACE_TEXT ("kernel32.dll")); if (hKernel32) @@ -320,7 +319,7 @@ ACE_Object_Manager::init (void) } } # endif // _M_IX86 -# endif // (_MSC_VER >= 1400) // VC++ 8.0 and above. +# endif // (_MSC_VER) // VC++ 8.0 #endif /* ACE_DISABLE_WIN32_ERROR_WINDOWS */ # if !defined (ACE_LACKS_ACE_SVCCONF) diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl index 370b74f25a1..37c7ce800ba 100644 --- a/ACE/ace/Select_Reactor_Base.inl +++ b/ACE/ace/Select_Reactor_Base.inl @@ -109,7 +109,7 @@ ACE_Event_Tuple::operator!= (const ACE_Event_Tuple &rhs) const return !(*this == rhs); } -#if defined (ACE_WIN32_VC8) || defined (ACE_WIN32_VC9) +#if defined (_MSC_VER) # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ #endif @@ -131,7 +131,7 @@ ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms) , supress_renew_ (0) { } -#if defined (ACE_WIN32_VC8) || defined (ACE_WIN32_VC9) +#if defined (_MSC_VER) # pragma warning (pop) #endif diff --git a/ACE/ace/Svc_Conf_Lexer.cpp b/ACE/ace/Svc_Conf_Lexer.cpp index 08d2f65d76b..d431f41472a 100644 --- a/ACE/ace/Svc_Conf_Lexer.cpp +++ b/ACE/ace/Svc_Conf_Lexer.cpp @@ -48,7 +48,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #define ACE_NO_STATE -1 #define ACE_COMMENT 0 -#if defined (_MSC_VER) && (_MSC_VER >= 1400) +#if defined (_MSC_VER) // Visual Studio .NET 2005 (VC8) issues warning C4351 for input_ in the // constructor initializer list below. Since we like the warned-of new // behavior (input_ elements will be default-initialized), squash the @@ -73,7 +73,7 @@ struct ace_yy_buffer_state #endif /* ACE_USES_WCHAR */ { } -#if defined (_MSC_VER) && (_MSC_VER >= 1400) +#if defined (_MSC_VER) # pragma warning (pop) #endif /* VC8 */ diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 9bd76af0c23..a835962f7ae 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1052,7 +1052,7 @@ ACE_WFMO_Reactor::work_pending (const ACE_Time_Value &) ACE_NOTSUP_RETURN (-1); } -#if defined (ACE_WIN32_VC8) +#if defined (_MSC_VER) # pragma warning (push) # pragma warning (disable:4355) /* Use of 'this' in initializer list */ # endif @@ -1121,7 +1121,7 @@ ACE_WFMO_Reactor::ACE_WFMO_Reactor (size_t size, ACE_TEXT ("%p\n"), ACE_TEXT ("WFMO_Reactor"))); } -#if defined (ACE_WIN32_VC8) +#if defined (_MSC_VER) # pragma warning (pop) #endif diff --git a/ACE/ace/checked_iterator.h b/ACE/ace/checked_iterator.h index 473ca5c9db9..bdbe4e3cf2c 100644 --- a/ACE/ace/checked_iterator.h +++ b/ACE/ace/checked_iterator.h @@ -30,12 +30,12 @@ * @author Ossama Othman */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION)) -// Checked iterators are currently only supported in MSVC++ 8 or better. +# if defined (_MSC_VER) && (!defined (_STLPORT_VERSION)) +// Checked iterators are currently only supported in MSVC++ # include -# endif /* _MSC_VER >= 1400 && !_STLPORT_VERSION */ +# endif /* _MSC_VER && !_STLPORT_VERSION */ -# if defined (_MSC_VER) && (_MSC_FULL_VER >= 140050000) && (!defined (_STLPORT_VERSION)) +# if defined (_MSC_VER) && (!defined (_STLPORT_VERSION)) template stdext::checked_array_iterator ACE_make_checked_array_iterator (PTR buf, size_t len) @@ -51,6 +51,6 @@ ACE_make_checked_array_iterator (PTR buf, size_t /* len */) // the buffer itself. return buf; } -# endif /* _MSC_VER >= 1400 && !_STLPORT_VERSION */ +# endif /* _MSC_VER && !_STLPORT_VERSION */ #endif /* ACE_CHECKED_ITERATOR_H */ diff --git a/ACE/ace/config-WinCE.h b/ACE/ace/config-WinCE.h index e9414226f7e..584dc2f762b 100644 --- a/ACE/ace/config-WinCE.h +++ b/ACE/ace/config-WinCE.h @@ -25,15 +25,6 @@ # define ACE_HAS_WINCE 1 #endif -#if defined (_MSC_VER) && (_MSC_VER < 1400) -// WinCE prior to Visual Studio 2005 integration doesn't have most of -// the standard C library time functions. It also doesn't define struct tm. -// SYSTEMTIME has pretty much the same info though, so we can map it when -// needed. Define struct tm here and use it when needed. This is taken -// from the standard C library. -# define ACE_LACKS_STRUCT_TM -#endif - // We need these libraries to build: #if defined (_MSC_VER) # pragma comment(lib,"corelibc.lib") @@ -102,10 +93,10 @@ #endif // ! defined(ACE_DEFAULT_THREAD_KEYS) // FILE stuff isn't always defined in CE -#if (_MSC_VER < 1400) && !defined (_FILE_DEFINED) +#if !defined (_FILE_DEFINED) typedef void FILE; # define _FILE_DEFINED -#endif /* _MSC_VER < 1400 && !_FILE_DEFINED */ +#endif /* !_FILE_DEFINED */ // This was defined in previous versions of CE, but not 2.11 #define EXCEPTION_ACCESS_VIOLATION STATUS_ACCESS_VIOLATION diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 55d11f9a46a..2b57e4697f7 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -121,16 +121,8 @@ ACE_END_VERSIONED_NAMESPACE_DECL // the _RWSTD_NO_CLASS_PARTIAL_SPEC feature test macro below. # include #endif /* __SUNPRO_CC <= 0x5110 */ -#if (defined (_MSC_VER) && (_MSC_VER <= 1310) && defined (_WIN64)) \ - || defined (ACE_HAS_BROKEN_STD_REVERSE_ITERATOR) - // VC 7.1 and the latest 64-bit platform SDK still don't define a standard - // compliant reverse_iterator adapter. -# define ACE_DECLARE_STL_REVERSE_ITERATORS \ - typedef std::reverse_iterator reverse_iterator; \ - typedef std::reverse_iterator const_reverse_iterator; -#elif defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ - && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) +#if defined (__SUNPRO_CC) && __SUNPRO_CC <= 0x5140 \ + && defined (_RWSTD_NO_CLASS_PARTIAL_SPEC) # define ACE_DECLARE_STL_REVERSE_ITERATORS \ typedef std::reverse_iterator const_reverse_iterator; #endif /* _MSC_VER && _WIN64 */ - #include /**/ "ace/post.h" #endif /* ACE_CONFIG_LITE_H */ diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h deleted file mode 100644 index 62dcdae8dd3..00000000000 --- a/ACE/ace/config-win32-msvc-10.h +++ /dev/null @@ -1,146 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-10.h - * - * @brief Microsoft Visual C++ 10.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 10. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_10_H -#define ACE_CONFIG_WIN32_MSVC_10_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC10 -# define ACE_WIN32_VC10 -#endif - -// Visual C++ 9.0 (.NET) deprecated the old iostreams -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif - -#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif - -// Windows' timeval is non-conformant (defined in terms of long instead of -// time_t) and VC8 changed time_t to a 64-bit value even when compiling a -// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few -// things for this compiler. See Time_Value.h for complete details. -#if !defined (_USE_32BIT_TIME_T) -# define ACE_HAS_TIME_T_LONG_MISMATCH -#endif - -#define ACE_HAS_ITOA -#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if defined (ACE_HAS_WINCE) -# define ACE_FILENO_EQUIVALENT ::_fileno -#else -# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -#endif - -// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 6.0 or less */ - -#define ACE_LACKS_STRPTIME - -// Evaluate this with a WinCE build; maybe things have improved since VC8. -//#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTRIN_H -# define ACE_HAS_INTRINSIC_INTERLOCKED -//#endif - -#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif - -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory. -#define ACE_NEW_THROWS_EXCEPTIONS -#define ACE_HAS_NEW_NOTHROW - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. - -// Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) - -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) - -// 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) -# define ACE_HAS_TR24731_2005_CRT -#endif - -// On CE w/o MFC config-WinCE.h needs to declare a placement new. This -// triggers a warning that there's no placement delete, which can be ignored. -#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) -# pragma warning(disable:4291) -#endif - -// A template can not be exported. Only an instantiation may be exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - -// Windows Vista and Windows Server 2008 and newer do have native condition -// variables, but this is commented out because the support in ACE hasn't -// been completed -// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) -// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE -// # undef ACE_LACKS_COND_T -// #endif - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_10_H */ diff --git a/ACE/ace/config-win32-msvc-11.h b/ACE/ace/config-win32-msvc-11.h deleted file mode 100644 index 8078ffa6040..00000000000 --- a/ACE/ace/config-win32-msvc-11.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-11.h - * - * @brief Microsoft Visual C++ 11.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 11. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_11_H -#define ACE_CONFIG_WIN32_MSVC_11_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC11 -# define ACE_WIN32_VC11 -#endif - -// Until we have specific msvc11 settings, include the msvc10 file -#include "ace/config-win32-msvc-10.h" - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_10_H */ diff --git a/ACE/ace/config-win32-msvc-12.h b/ACE/ace/config-win32-msvc-12.h deleted file mode 100644 index 0b59cd44685..00000000000 --- a/ACE/ace/config-win32-msvc-12.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-12.h - * - * @brief Microsoft Visual C++ 12.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 12. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_12_H -#define ACE_CONFIG_WIN32_MSVC_12_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC12 -# define ACE_WIN32_VC12 -#endif - -// Until we have specific msvc12 settings, include the msvc11 file -#include "ace/config-win32-msvc-11.h" - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_10_H */ diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index dfa98d930bd..fbbc5fa15ec 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -23,8 +23,123 @@ # define ACE_WIN32_VC14 #endif -// Until we have specific msvc14 settings, include the msvc12 file -#include "ace/config-win32-msvc-12.h" +// Visual C++ 9.0 (.NET) deprecated the old iostreams +#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) +#define ACE_HAS_STANDARD_CPP_LIBRARY 1 +#endif + +#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +#endif + +// Windows' timeval is non-conformant (defined in terms of long instead of +// time_t) and VC8 changed time_t to a 64-bit value even when compiling a +// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few +// things for this compiler. See Time_Value.h for complete details. +#if !defined (_USE_32BIT_TIME_T) +# define ACE_HAS_TIME_T_LONG_MISMATCH +#endif + +#define ACE_HAS_ITOA +#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE +#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR + +#define ACE_ITOA_EQUIVALENT ::_itoa +#define ACE_STRCASECMP_EQUIVALENT ::_stricmp +#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp +#define ACE_WCSDUP_EQUIVALENT ::_wcsdup +#if defined (ACE_HAS_WINCE) +# define ACE_FILENO_EQUIVALENT ::_fileno +#else +# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) +#endif + +// Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) +# define ACE_HAS_SIG_ATOMIC_T +# endif /* !Win CE 6.0 or less */ + +#define ACE_LACKS_STRPTIME + +// Evaluate this with a WinCE build; maybe things have improved since VC8. +//#if !defined (ACE_HAS_WINCE) +# define ACE_HAS_INTRIN_H +# define ACE_HAS_INTRINSIC_INTERLOCKED +//#endif + +#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) +# define ACE_HAS_INTRINSIC_BYTESWAP +#endif + +#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES +#define ACE_LACKS_STRRECVFD +#define ACE_HAS_CPLUSPLUS_HEADERS + +#define ACE_TEMPLATES_REQUIRE_SOURCE + +// Platform provides ACE_TLI function prototypes. +// For Win32, this is not really true, but saves a lot of hassle! +#define ACE_HAS_TLI_PROTOTYPES + +// Platform support linebuffered streaming is broken +#define ACE_LACKS_LINEBUFFERED_STREAMBUF + +#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) + +// Platform has its Standard C++ library in the namespace std +# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 +# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ + +// ace/iostream.h does not work with the standard cpp library (yet). +# if !defined (ACE_USES_OLD_IOSTREAMS) +# define ACE_LACKS_ACE_IOSTREAM +# endif /* ! ACE_USES_OLD_IOSTREAMS */ + +#define ACE_NEW_THROWS_EXCEPTIONS +#define ACE_HAS_NEW_NOTHROW + +#else + +// iostream header lacks ipfx (), isfx (), etc., declarations +# define ACE_LACKS_IOSTREAM_FX + +#endif + +// There are too many instances of this warning to fix it right now. +// Maybe in the future. + +// Disable warning of using Microsoft Extension. +# pragma warning(disable:4231) + +// 'class1' : inherits 'class2::member' via dominance +#pragma warning(disable:4250) + +// 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) +# define ACE_HAS_TR24731_2005_CRT +#endif + +// On CE w/o MFC config-WinCE.h needs to declare a placement new. This +// triggers a warning that there's no placement delete, which can be ignored. +#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) +# pragma warning(disable:4291) +#endif + +// A template can not be exported. Only an instantiation may be exported. +#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT + +// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to +// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. +# define ACE_NEEDS_FUNC_DEFINITIONS + +// Windows Vista and Windows Server 2008 and newer do have native condition +// variables, but this is commented out because the support in ACE hasn't +// been completed +// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) +// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE +// # undef ACE_LACKS_COND_T +// #endif #define ACE_HAS_POSIX_TIME 1 #define ACE_LACKS_TIMESPEC_T 1 diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h deleted file mode 100644 index 9db4d39204b..00000000000 --- a/ACE/ace/config-win32-msvc-7.h +++ /dev/null @@ -1,119 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-7.h - * - * @brief Microsoft Visual C++ 7.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 7. - * - * @note Do not include this file directly, include config-win32.h instead. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_7_H -#define ACE_CONFIG_WIN32_MSVC_7_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -// Visual C++ 7.0 (.NET) deprecated the old iostreams -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif - -#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif - -// Win64 SDK compiler claims std::auto_ptr<>::reset not available. -#if defined (_WIN64) || defined (WIN64) -#define ACE_AUTO_PTR_LACKS_RESET -#endif - -#define ACE_HAS_ITOA -#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup - -#define ACE_LACKS_STRPTIME - -#define ACE_LACKS_STRTOK_R - -#define ACE_HAS_SIG_ATOMIC_T -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#if !defined (ACE_HAS_WINCE) && !(defined (__INTEL_COMPILER) && (__INTEL_COMPILER == 900)) -# define ACE_HAS_INTRINSIC_INTERLOCKED -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory. -// Since we don't support MSVC 7.0, don't test for it. -# define ACE_NEW_THROWS_EXCEPTIONS -# define ACE_HAS_NEW_NOTHROW - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. -// 'this' : used in base member initializer list -#pragma warning(disable:4355) - -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) - -// C++ Exception Specification ignored -#pragma warning(disable:4290) - -// Disable warning of using Microsoft Extension. -#pragma warning(disable:4231) - -// 'function' : unreferenced local function has been removed -#pragma warning(disable:4505) - -// A template can not be exported. Only an instantiation may be exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_7_H */ diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h deleted file mode 100644 index c2dfcfddd37..00000000000 --- a/ACE/ace/config-win32-msvc-8.h +++ /dev/null @@ -1,155 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-8.h - * - * @brief Microsoft Visual C++ 8.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 8. - * - * @note Do not include this file directly, include config-win32.h instead. - * - * @author Darrell Brunsch - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_8_H -#define ACE_CONFIG_WIN32_MSVC_8_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC8 -# define ACE_WIN32_VC8 -#endif - -// Visual C++ 8.0 (.NET) deprecated the old iostreams -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif - -#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif - -// Windows' timeval is non-conformant (defined in terms of long instead of -// time_t) and VC8 changed time_t to a 64-bit value even when compiling a -// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few -// things for this compiler. See Time_Value.h for complete details. -#if !defined (_USE_32BIT_TIME_T) -# define ACE_HAS_TIME_T_LONG_MISMATCH -#endif - -#define ACE_HAS_ITOA -#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if defined (ACE_HAS_WINCE) -# define ACE_FILENO_EQUIVALENT ::_fileno -#else -# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -#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 -// 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) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 6.0 or less */ - -#define ACE_LACKS_STRPTIME - -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTRIN_H -# define ACE_HAS_INTRINSIC_INTERLOCKED -#endif - -#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif - -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory. -#define ACE_NEW_THROWS_EXCEPTIONS -#define ACE_HAS_NEW_NOTHROW - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. - -// Disable warning of using Microsoft Extension. -#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) -# define ACE_HAS_TR24731_2005_CRT -#endif - -// Detect Platform SDK 64-bit (AMD64) compiler using _MSC_FULL_VER -#if (defined (_WIN64) || defined (WIN64)) && _MSC_FULL_VER < 140050000 -# define ACE_AUTO_PTR_LACKS_RESET -# define ACE_MSVC_USES_DOUBLE_UNDERSCORE_STAT64 -# define ACE_HAS_BROKEN_STD_REVERSE_ITERATOR -# define ACE_LACKS_NUMERIC_LIMITS_64_BIT_TYPES -# undef ACE_HAS_TR24731_2005_CRT -# undef ACE_HAS_INTRIN_H -#endif - -// On CE w/o MFC config-WinCE.h needs to declare a placement new. This -// triggers a warning that there's no placement delete, which can be ignored. -#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) -# pragma warning(disable:4291) -#endif - -// A template can not be exported. Only an instantiation may be exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_8_H */ diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h deleted file mode 100644 index 19865aa34b0..00000000000 --- a/ACE/ace/config-win32-msvc-9.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- C++ -*- */ -//============================================================================= -/** - * @file config-win32-msvc-9.h - * - * @brief Microsoft Visual C++ 9.0 configuration file. - * - * This file is the ACE configuration file for Microsoft Visual C++ version 9. - * - * @note Do not include this file directly, include config-win32.h instead. - */ -//============================================================================= - -#ifndef ACE_CONFIG_WIN32_MSVC_9_H -#define ACE_CONFIG_WIN32_MSVC_9_H -#include /**/ "ace/pre.h" - -#ifndef ACE_CONFIG_WIN32_H -#error Use config-win32.h in config.h instead of this header -#endif /* ACE_CONFIG_WIN32_H */ - -#ifndef ACE_WIN32_VC9 -# define ACE_WIN32_VC9 -#endif - -// Visual C++ 9.0 (.NET) deprecated the old iostreams -#if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) -#define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#endif - -#if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -#define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -#endif - -// Windows' timeval is non-conformant (defined in terms of long instead of -// time_t) and VC9 changed time_t to a 64-bit value even when compiling a -// 32-bit application. Therefore, ace/Time_Value needs to rearrange a few -// things for this compiler. See Time_Value.h for complete details. -#if !defined (_USE_32BIT_TIME_T) -# define ACE_HAS_TIME_T_LONG_MISMATCH -#endif - -#define ACE_HAS_ITOA -#define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - -#define ACE_ITOA_EQUIVALENT ::_itoa -#define ACE_STRCASECMP_EQUIVALENT ::_stricmp -#define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp -#define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if defined (ACE_HAS_WINCE) -# define ACE_FILENO_EQUIVALENT ::_fileno -#else -# define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) -#endif - -// Windows CE 7 doesn't do sig_atomic_t, but maybe future versions will. -# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x700) -# define ACE_HAS_SIG_ATOMIC_T -# endif /* !Win CE 7.0 or less */ - -#define ACE_LACKS_STRPTIME - -#if !defined (ACE_HAS_WINCE) -# define ACE_HAS_INTRIN_H -# define ACE_HAS_INTRINSIC_INTERLOCKED -#endif - -#if !defined (_WIN32_WCE) || (_WIN32_WCE >= 0x501) -# define ACE_HAS_INTRINSIC_BYTESWAP -#endif - -#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES -#define ACE_LACKS_STRRECVFD -#define ACE_HAS_CPLUSPLUS_HEADERS - -#define ACE_TEMPLATES_REQUIRE_SOURCE - -// Platform provides ACE_TLI function prototypes. -// For Win32, this is not really true, but saves a lot of hassle! -#define ACE_HAS_TLI_PROTOTYPES - -// Platform support linebuffered streaming is broken -#define ACE_LACKS_LINEBUFFERED_STREAMBUF - -#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0) - -// Platform has its Standard C++ library in the namespace std -# if !defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) -# define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ - -// ace/iostream.h does not work with the standard cpp library (yet). -# if !defined (ACE_USES_OLD_IOSTREAMS) -# define ACE_LACKS_ACE_IOSTREAM -# endif /* ! ACE_USES_OLD_IOSTREAMS */ - -// Starting with MSVC 7.1, std::new throws std::bad_alloc on out-of-memory. -#define ACE_NEW_THROWS_EXCEPTIONS -#define ACE_HAS_NEW_NOTHROW - -#else - -// iostream header lacks ipfx (), isfx (), etc., declarations -# define ACE_LACKS_IOSTREAM_FX - -#endif - -// There are too many instances of this warning to fix it right now. -// Maybe in the future. - -// Disable warning of using Microsoft Extension. -# pragma warning(disable:4231) - -// 'class1' : inherits 'class2::member' via dominance -#pragma warning(disable:4250) - -// 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) -# define ACE_HAS_TR24731_2005_CRT -#endif - -// On CE w/o MFC config-WinCE.h needs to declare a placement new. This -// triggers a warning that there's no placement delete, which can be ignored. -#if defined (ACE_HAS_WINCE) && !defined (ACE_HAS_MFC) -# pragma warning(disable:4291) -#endif - -// A template can not be exported. Only an instantiation may be exported. -#define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT - -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - -// Windows Vista and Windows Server 2008 and newer do have native condition -// variables, but this is commented out because the support in ACE hasn't -// been completed -// #if defined (_WIN32_WINNT) && (_WIN32_WINNT >= 0x0600) -// # define ACE_HAS_WTHREADS_CONDITION_VARIABLE -// # undef ACE_LACKS_COND_T -// #endif - -#include /**/ "ace/post.h" -#endif /* ACE_CONFIG_WIN32_MSVC_9_H */ diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 5736e56913a..63004ef78ce 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -44,18 +44,6 @@ # include "ace/config-win32-msvc-141.h" #elif (_MSC_VER >= 1900) # include "ace/config-win32-msvc-14.h" -#elif (_MSC_VER >= 1800) -# include "ace/config-win32-msvc-12.h" -#elif (_MSC_VER >= 1700) -# include "ace/config-win32-msvc-11.h" -#elif (_MSC_VER >= 1600) -# include "ace/config-win32-msvc-10.h" -#elif (_MSC_VER >= 1500) -# include "ace/config-win32-msvc-9.h" -#elif (_MSC_VER >= 1400) -# include "ace/config-win32-msvc-8.h" -#elif (_MSC_VER >= 1310) -# include "ace/config-win32-msvc-7.h" #else # error This version of Microsoft Visual C++ is not supported. #endif @@ -103,9 +91,6 @@ #define ACE_LACKS_NETDB_H #define ACE_LACKS_NET_IF_H #define ACE_LACKS_NETINET_IN_H -#if !defined (ACE_WIN32_VC14) -# define ACE_LACKS_STDINT_H -#endif #define ACE_LACKS_STROPTS_H #define ACE_LACKS_SYS_IOCTL_H #define ACE_LACKS_SYS_IPC_H -- cgit v1.2.1