diff options
| -rw-r--r-- | ACE/ChangeLog | 16 | ||||
| -rw-r--r-- | ACE/ace/Monitor_Control/Monitor_Control.mpc | 2 | ||||
| -rw-r--r-- | ACE/ace/QoS/qos.mpc | 2 | ||||
| -rw-r--r-- | ACE/ace/ace_for_tao.mpc | 2 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc-10.h | 140 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc.h | 4 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ace_fl.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ace_gl.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ace_qt.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ace_x11.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/crosscompile.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/ipv6.mpb | 2 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/vc_warnings.mpb | 6 |
13 files changed, 171 insertions, 13 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 227a5eca25d..d552e7ee43a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,19 @@ +Mon Nov 10 10:46:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/ace_for_tao.mpc + * ace/config-win32-msvc-10.h + * ace/config-win32-msvc.h + * ace/Monitor_Control/Monitor_Control.mpc + * ace/QoS/qos.mpc + * bin/MakeProjectCreator/config/ace_fl.mpb + * bin/MakeProjectCreator/config/ace_gl.mpb + * bin/MakeProjectCreator/config/ace_qt.mpb + * bin/MakeProjectCreator/config/ace_x11.mpb + * bin/MakeProjectCreator/config/crosscompile.mpb + * bin/MakeProjectCreator/config/ipv6.mpb + * bin/MakeProjectCreator/config/vc_warnings.mpb + Added Visual Studio 2010 (vc10) support + Mon Nov 10 09:50:00 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-WinCE.h: diff --git a/ACE/ace/Monitor_Control/Monitor_Control.mpc b/ACE/ace/Monitor_Control/Monitor_Control.mpc index 9bbafab4e0b..681bf4f9c94 100644 --- a/ACE/ace/Monitor_Control/Monitor_Control.mpc +++ b/ACE/ace/Monitor_Control/Monitor_Control.mpc @@ -33,7 +33,7 @@ project(Monitor_Control) : acelib, ace_etcl_parser, ace_output, install { Monitor_Control_utils.h } - specific (vc6, vc7, vc71, vc8, vc9, nmake) { + specific (vc6, vc7, vc71, vc8, vc9, vc10, nmake) { lit_libs += pdh } } diff --git a/ACE/ace/QoS/qos.mpc b/ACE/ace/QoS/qos.mpc index f8f19077285..5e9dc059ac8 100644 --- a/ACE/ace/QoS/qos.mpc +++ b/ACE/ace/QoS/qos.mpc @@ -7,7 +7,7 @@ project(QoS) : acelib, ace_output, install { dynamicflags = ACE_QoS_BUILD_DLL macros += ACE_HAS_QOS - specific(bmake, nmake, em3, vc6, vc7, vc71, vc8, vc9) { + specific(bmake, nmake, em3, vc6, vc7, vc71, vc8, vc9, vc10) { macros += ACE_HAS_WINSOCK2_GQOS } diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 1a4d562211f..f1dd97b5715 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -195,7 +195,7 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, } // ACE_Token implementation uses semaphores on Windows and VxWorks. - conditional(vc6,vc71,vc8,vc9,nmake,bmake) { + conditional(vc6,vc71,vc8,vc9,vc10,nmake,bmake) { NT_Service.cpp // Required by ace_for_tao sponsors Semaphore.cpp Process_Mutex.cpp diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h new file mode 100644 index 00000000000..b641381cdce --- /dev/null +++ b/ACE/ace/config-win32-msvc-10.h @@ -0,0 +1,140 @@ +/* -*- C++ -*- */ +//============================================================================= +/** + * @file config-win32-msvc-10.h + * + * $Id$ + * + * @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 VC9 (on desktop, not CE) 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 (ACE_HAS_WINCE) +# 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 + +#define ACE_HAS_EXCEPTIONS + +// Windows Mobile 5 doesn't do sig_atomic_t, but maybe future versions will. +# if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x501) +# define ACE_HAS_SIG_ATOMIC_T +# endif /* !Win CE 5.0 or less */ + +#define ACE_HAS_STRERROR +#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_HAS_TEMPLATE_TYPEDEFS +#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 + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_MSVC_10_H */ diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 1bec0e04cd8..a6e8d3181f9 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -48,7 +48,9 @@ # define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS) #endif /* _WIN32_WCE */ -#if (_MSC_VER >= 1500) +#if (_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" diff --git a/ACE/bin/MakeProjectCreator/config/ace_fl.mpb b/ACE/bin/MakeProjectCreator/config/ace_fl.mpb index fd7f56695aa..2f42e405db6 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_fl.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_fl.mpb @@ -12,7 +12,7 @@ project : ace_x11, ace_gl { LDFLAGS += $(PLATFORM_FL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) LDFLAGS += $(PLATFORM_GL_LDFLAGS) } - specific(vc9,vc8,vc71,vc7,vc6) { + specific(vc10,vc9,vc8,vc71) { libs += fltkdll } diff --git a/ACE/bin/MakeProjectCreator/config/ace_gl.mpb b/ACE/bin/MakeProjectCreator/config/ace_gl.mpb index 645fd0104aa..4b18245232a 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_gl.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_gl.mpb @@ -10,7 +10,7 @@ project : ace_x11 { LIBS += $(PLATFORM_GL_LIBS) $(PLATFORM_X11_LIBS) LDFLAGS += $(PLATFORM_GL_LDFLAGS) $(PLATFORM_GL_LDFLAGS) } - specific(vc6,vc7,vc71,vc8,vc9) { + specific(vc71,vc8,vc9,vc10) { lit_libs += OpenGL32 } } diff --git a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb index 3c8635caaf2..d5853390400 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_qt.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_qt.mpb @@ -21,7 +21,7 @@ project: qt { pure_libs += $(ACE_QT_LIBS) } - specific(vc6, vc7, vc71, vc8, vc9, nmake) { + specific(vc71, vc8, vc9, vc10, nmake) { lit_libs -= qt-mt$(QT_VERSION) pure_libs += $(PLATFORM_QT_LIBS) } diff --git a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb index 38164eb093f..ac67115901d 100644 --- a/ACE/bin/MakeProjectCreator/config/ace_x11.mpb +++ b/ACE/bin/MakeProjectCreator/config/ace_x11.mpb @@ -2,7 +2,7 @@ // $Id$ project { - specific(vc6,vc7,vc71,vc8,vc9) { + specific(vc71,vc8,vc9,vc10) { } else { requires += x11 } diff --git a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb index 4f5853cd4a5..2aba9af82ad 100644 --- a/ACE/bin/MakeProjectCreator/config/crosscompile.mpb +++ b/ACE/bin/MakeProjectCreator/config/crosscompile.mpb @@ -2,7 +2,7 @@ // $Id$ project { - specific(vc7, vc71, vc8, vc9) { + specific(vc7, vc71, vc8, vc9, vc10) { nocross = 1 } verbatim(gnuace, circuit) { diff --git a/ACE/bin/MakeProjectCreator/config/ipv6.mpb b/ACE/bin/MakeProjectCreator/config/ipv6.mpb index 14d48b8a642..8184e876675 100644 --- a/ACE/bin/MakeProjectCreator/config/ipv6.mpb +++ b/ACE/bin/MakeProjectCreator/config/ipv6.mpb @@ -2,7 +2,7 @@ // $Id$ feature(ipv6) { - specific(vc6, vc7, vc71, vc8, vc9, nmake, bmake, bds4) { + specific(vc6, vc7, vc71, vc8, vc9, vc10, nmake, bmake, bds4) { lit_libs += iphlpapi } diff --git a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb index 32e49922a7b..3e8ae307f7d 100644 --- a/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb +++ b/ACE/bin/MakeProjectCreator/config/vc_warnings.mpb @@ -10,19 +10,19 @@ feature(vc_avoid_crt_secure_warnings) { - specific(vc8, vc9, nmake) { + specific(vc8, vc9, vc10, nmake) { macros += _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE _CRT_NONSTDC_NO_DEPRECATE } } feature(!vc_scl_secure_warnings) { - specific(vc8, vc9, nmake) { + specific(vc8, vc9, vc10, nmake) { macros += _SCL_SECURE_NO_WARNINGS } } feature(vc_avoid_this_in_initializer_warnings) { - specific(vc8, vc9) { + specific(vc8, vc9, vc10) { DisableSpecificWarnings += 4355 } specific(nmake) { |