diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-10 21:28:52 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2013-04-10 21:28:52 +0000 |
| commit | d62c5ec7d94df4ecb26cbb898cdb7e8b40aecf4c (patch) | |
| tree | d488cbd6fe50cc7d1dc3aa6055c937316db62e55 | |
| parent | c4610fb16827cb4395cedfcf9ce57a081dfd71c6 (diff) | |
| download | ATCD-d62c5ec7d94df4ecb26cbb898cdb7e8b40aecf4c.tar.gz | |
merge from trunk
76 files changed, 583 insertions, 294 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 39d54578c55..ae8908157b1 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,134 @@ +Sun Apr 7 00:20:49 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/Global_Macros.h: Added documentation for the arguments to + the ACE_GUARD_XXX macros. Thanks to Neil Youngman <ny at + youngman dot org dot uk> for contributing this. + +Thu Apr 4 16:29:07 UTC 2013 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * examples/Connection/non_blocking/CPP-acceptor.{h,cpp}, + examples/Connection/non_blocking/CPP-connector.{h,cpp}: Replaced + the use of macros with actual traits since they should be + available on all C++ compilers we support now. + +Thu Apr 4 18:41:36 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * debian/ace.dsc: + * debian/debian.changelog: + * debian/debian.control: + Updated for new release, thanks to Michael Ganz <michael_ganz at t-online dot de> + for reporting this + +Wed Apr 3 13:41:19 UTC 2013 Adam Mitz <mitza@ociweb.com> + + * tests/Manual_Event_Test.cpp: + + Corrected time value to actually be 200 msec as noted in the comment. + +Wed Apr 3 08:13:00 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/auto_run_tests.pl: + * tests/run_test.pl: + Set some additional variables that can be used with coverity + +Tue Apr 2 09:07:13 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * ace/OS_NS_stdio.h: + Fix missing intptr_t declaration on QNX. + +Sat Mar 30 18:11:06 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * examples/C++NPv1/Reactive_Logging_Server_Ex.h: + Fixed truncating cast error. + +Sat Mar 30 09:44:50 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * ace/config-win32-mingw64.h: + Minor comment update. + +Sat Mar 30 09:30:10 UTC 2013 Martin Corino <mcorino@remedy.nl> + + * include/makeinclude/platform_mingw32.GNU: + Added support for latest GCC from MinGW64. + + * ace/config-win32.h: + * ace/config-win32-mingw.h: + Split support for MinGW64 variants of MinGW compilers + into separate files because of tricky differences between + MinGW32 and MinGW64 APIs. + + * ace/config-win32-mingw64.h: + Added separate support file for MinGW64 compilers (both + 32 and 64 bit). + + * ace/CDR_Base.inl: + More standardized use of ACE_LACKS_INLINE_ASSEMBLY for benefit + of MinGW64 64bit compiler. + + * ace/Functor_T.h: + * ace/Functor_T.inl: + * ace/OS_NS_stdio.h: + * ace/OS_NS_stdio.inl: + * ace/OS_NS_sys_stat.inl: + * ace/Process.cpp: + * ace/SV_Semaphore_Simple.cpp: + * ace/Timer_Wheel_T.cpp: + * apps/Gateway/Gateway/Gateway.cpp: + * examples/C++NPv1/Reactive_Logging_Server.h: + * examples/C++NPv1/Reactive_Logging_Server_Ex.h: + * examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp: + * examples/Reactor/Misc/test_early_timeouts.cpp: + * performance-tests/SCTP/SOCK_STREAM_srv.cpp: + * tests/Map_Test.h: + * tests/Process_Env_Test.cpp: + * tests/Thread_Timer_Queue_Adapter_Test.cpp: + All kinds of minor updates and corrections to silence + warnings and errors relating to either 64bit Windows or + the very latest GCC (4.8.0). Mostly precision loss and + truncating casts. + +Thu Mar 28 08:52:43 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * docs/ACE-bug-process.html: + Fixed typo + +Mon Mar 25 21:03:54 UTC 2013 Abdullah Sowayan <sowayan@gmail.com> + + * include/makeinclude/platform_macosx_iOS.GNU: + + Minor updates to fix iOS builds. + +Fri Mar 22 02:58:06 UTC 2013 Abdullah Sowayan <sowayan@gmail.com> + + * include/makeinclude/platform_macosx_iOS.GNU: + + Minor updates to fix iOS builds. + +Thu Mar 14 12:44:10 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/make_release.py: + Exclude new workspace + +Thu Mar 14 10:08:55 UTC 2013 Marcel Smit <msmit@remedy.nl> + + * bin/fuzz.pl: + Checking the last part of the given @file entry, instead of + the filename only. + +Thu Mar 14 08:38:57 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * ChangeLog: + * NEWS: + * bin/diff-builds-and-group-fixed-tests-only.sh: + * docs/Download.html: + * docs/bczar/bczar.html: + * etc/index.html: + Making new x.1.8 public available + +Thu Mar 14 09:04:46 CET 2013 Johnny Willemsen <jwillemsen@remedy.nl> + + * ACE version 6.1.8 released. + Thu Mar 7 19:17:15 UTC 2013 Phil Mesnier <mesnier_p@ociweb.com> * ace/OS_NS_Thread.cpp: @@ -10,7 +141,6 @@ Fri Mar 1 11:21:33 UTC 2013 Martin Corino <mcorino@remedy.nl> Fix for problems with explicit test root and test folders that are also available in default roots. - Thu Feb 28 19:45:03 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl> * tests/Compiler_Features_19_Test.cpp: @@ -1,6 +1,15 @@ +USER VISIBLE CHANGES BETWEEN ACE-6.1.8 and ACE-6.2.0 +==================================================== + +. Added MinGW64 as supported platform + +. Added support for GCC 4.8.0 + USER VISIBLE CHANGES BETWEEN ACE-6.1.7 and ACE-6.1.8 ==================================================== +. Small bug fixes + USER VISIBLE CHANGES BETWEEN ACE-6.1.6 and ACE-6.1.7 ==================================================== diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 62fb06db0fb..6c3e5de79a5 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -40,7 +40,7 @@ To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] - ACE VERSION: 6.1.7 + ACE VERSION: 6.1.8 HOST MACHINE and OPERATING SYSTEM: If on Windows based OS's, which version of WINSOCK do you diff --git a/ACE/THANKS b/ACE/THANKS index 03a5b7145c8..0193e0fbce7 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2377,6 +2377,7 @@ Phillip LaBanca <labancap at ociweb dot com> <pkow88776 at onet dot pl> Journeyer J. Joh <oosaprogrammer at gmail dot com> Rudy Pot <rpot at aweta dot nl> +Neil Youngman <ny at youngman dot org dot uk> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/VERSION b/ACE/VERSION index e21d14264a3..5108ebf6026 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,4 +1,4 @@ -This is ACE version 6.1.7, released Thu Dec 27 10:00:49 CET 2012 +This is ACE version 6.1.8, released Thu Mar 14 09:04:46 CET 2013 If you have any problems with or questions about ACE, please send e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu), diff --git a/ACE/ace/CDR_Base.inl b/ACE/ace/CDR_Base.inl index b84470af87f..351c853c2e3 100644 --- a/ACE/ace/CDR_Base.inl +++ b/ACE/ace/CDR_Base.inl @@ -145,12 +145,14 @@ ACE_CDR::swap_8 (const char* orig, char* target) #elif defined (ACE_HAS_BSWAP_64) *reinterpret_cast<uint64_t *> (target) = bswap_64 (*reinterpret_cast<uint64_t const *> (orig)); -#elif (defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__) +#elif (defined (__amd64__) || defined (__x86_64__)) && defined(__GNUG__) \ + && !defined(ACE_LACKS_INLINE_ASSEMBLY) register unsigned long x = * reinterpret_cast<const unsigned long*> (orig); asm ("bswapq %1" : "=r" (x) : "0" (x)); *reinterpret_cast<unsigned long*> (target) = x; -#elif defined(ACE_HAS_PENTIUM) && defined(__GNUG__) +#elif defined(ACE_HAS_PENTIUM) && defined(__GNUG__) \ + && !defined(ACE_LACKS_INLINE_ASSEMBLY) register unsigned int i = *reinterpret_cast<const unsigned int*> (orig); register unsigned int j = diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index f8a215c078e..d35f4e2aaef 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -37,6 +37,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "ace/Functor_String.h" +#include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Functor_T.inl b/ACE/ace/Functor_T.inl index d6cefade1bd..f22672d7fa5 100644 --- a/ACE/ace/Functor_T.inl +++ b/ACE/ace/Functor_T.inl @@ -40,7 +40,7 @@ ACE_Pointer_Hash<TYPE>::operator () (TYPE t) const # pragma warning(push) # pragma warning(disable : 4311) /* Truncate pointer to unsigned long */ #endif /* ACE_WIN64 */ - return reinterpret_cast<unsigned long> (t); + return ACE_Utils::truncate_cast<unsigned long> ((intptr_t)t); #if defined (ACE_WIN64) # pragma warning(pop) #endif /* ACE_WIN64 */ diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 74c6d8c3e6b..cf24327650b 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -108,17 +108,37 @@ ACE_END_VERSIONED_NAMESPACE_DECL // FUZZ: disable check_for_ACE_Guard -// Convenient macro for testing for deadlock, as well as for detecting -// when mutexes fail. -/* @warning - * Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the current - * function to return if the lock is not acquired. Since merely returning - * (no value) almost certainly fails to handle the acquisition failure - * and almost certainly fails to communicate the failure to the caller - * for the caller to handle, ACE_GUARD() is almost always the wrong - * thing to do. The same goes for ACE_WRITE_GUARD() and ACE_READ_GUARD() . - * ACE_GUARD_REACTION() is better because it lets you specify error - * handling code. +/* Convenient macro for testing for deadlock, as well as for detecting + * when mutexes fail. + * + * The parameters to the ACE_GUARD_XXX macros are used as follows: + * + * MUTEX - This is the type used as the template parameter for ACE_Guard + * + * OBJ - Name for the guard object. This name should not be declared + * outside the macro. + * + * LOCK - The actual lock (mutex) variable. This should be a variable + * of type MUTEX, see above. + * + * ACTION - Code segment to be run, if and only if the lock is + * acquired. + * + * REACTION - Code segment to be run, if and only if the lock is not + * acquired. + * + * RETURN - A value to be returned from the calling function, if and + * only if the lock is not acquired. + * + * @warning + * Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the + * current function to return if the lock is not acquired. Since + * merely returning (no value) almost certainly fails to handle the + * acquisition failure and almost certainly fails to communicate the + * failure to the caller for the caller to handle, ACE_GUARD() is + * almost always the wrong thing to do. The same goes for + * ACE_WRITE_GUARD() and ACE_READ_GUARD() . ACE_GUARD_REACTION() is + * better because it lets you specify error handling code. */ #if !defined (ACE_GUARD_ACTION) #define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \ diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 411c1e5ee58..761db883356 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -27,6 +27,7 @@ #include "ace/os_include/os_stdio.h" #include "ace/os_include/os_fcntl.h" +#include "ace/os_include/os_inttypes.h" #include /**/ "ace/ACE_export.h" /* OPENVMS needs unistd for cuserid() */ @@ -117,7 +118,7 @@ inline ACE_HANDLE ace_fileno_helper (FILE *fp) return (ACE_HANDLE)fileno (fp); # undef fileno # else - return (ACE_HANDLE)ACE_STD_NAMESPACE::fileno (fp); + return (ACE_HANDLE)(intptr_t)ACE_STD_NAMESPACE::fileno (fp); # endif /* defined (fileno) */ } #endif /* !ACE_FILENO_EQUIVALENT */ diff --git a/ACE/ace/OS_NS_stdio.inl b/ACE/ace/OS_NS_stdio.inl index e24a4024f11..60031b4fd63 100644 --- a/ACE/ace/OS_NS_stdio.inl +++ b/ACE/ace/OS_NS_stdio.inl @@ -583,7 +583,7 @@ ACE_INLINE ACE_HANDLE ACE_OS::fileno (FILE *stream) { #if defined ACE_FILENO_EQUIVALENT - return (ACE_HANDLE)ACE_FILENO_EQUIVALENT (stream); + return (ACE_HANDLE)((intptr_t)ACE_FILENO_EQUIVALENT (stream)); #else return ace_fileno_helper (stream); #endif @@ -1014,6 +1014,12 @@ ACE_OS::vsprintf (wchar_t *buffer, const wchar_t *format, va_list argptr) // ACE_OS::snprintf(). return vswprintf (buffer, 4096, format, argptr); +# elif defined (__MINGW64_VERSION_MAJOR) && !defined (WIN64) + // the MingW64 32bit version causes link errors when using the + // 'standard' vswprint(). Luckily they have a mingw special. + + return __mingw_vswprintf (buffer, format, argptr); + # elif defined (ACE_WIN32) // Windows has vswprintf, but the pre-VC8 signature is from the older // ISO C standard. Also see ACE_OS::snprintf() for more info on this. diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index b34d5bdeda0..0f769cd7cb5 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -262,7 +262,7 @@ namespace ACE_OS return 0; #elif defined (__BORLANDC__) \ || defined (_MSC_VER) \ - || defined (__MINGW32__) + || (defined (__MINGW32__) && !defined (__MINGW64_VERSION_MAJOR)) ACE_OSCALL_RETURN (ACE_WSTAT_FUNC_NAME (file, stp), int, -1); #else /* ACE_HAS_WINCE */ ACE_Wide_To_Ascii nfile (file); diff --git a/ACE/ace/Process.cpp b/ACE/ace/Process.cpp index b3471897404..6ba69acbf0e 100644 --- a/ACE/ace/Process.cpp +++ b/ACE/ace/Process.cpp @@ -116,9 +116,14 @@ ACE_Process::spawn (ACE_Process_Options &options) { #if defined (ACE_WIN32) # if defined (ACE_WIN64) +// silence warnings coming from MinGW64 compilers +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wformat" +# pragma GCC diagnostic ignored "-Wformat-extra-args" curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len], ACE_TEXT (" +H %I64p"), h); +# pragma GCC diagnostic pop # else curr_len += ACE_OS::sprintf (&cmd_line_buf[curr_len], ACE_TEXT (" +H %p"), diff --git a/ACE/ace/SV_Semaphore_Simple.cpp b/ACE/ace/SV_Semaphore_Simple.cpp index bdf4531f4e1..2b340649ed1 100644 --- a/ACE/ace/SV_Semaphore_Simple.cpp +++ b/ACE/ace/SV_Semaphore_Simple.cpp @@ -141,7 +141,7 @@ ACE_SV_Semaphore_Simple::name_2_key (const char *name) # pragma warning(push) # pragma warning(disable : 4312) #endif /* defined (ACE_WIN32) && defined (_MSC_VER) */ - return (key_t) ACE::crc32 (name); + return (key_t)(intptr_t)ACE::crc32 (name); #if defined (ACE_WIN32) && defined (_MSC_VER) # pragma warning(pop) #endif /* defined (ACE_WIN32) && defined (_MSC_VER) */ diff --git a/ACE/ace/Timer_Wheel_T.cpp b/ACE/ace/Timer_Wheel_T.cpp index 2ede9545028..cf0f957edd5 100644 --- a/ACE/ace/Timer_Wheel_T.cpp +++ b/ACE/ace/Timer_Wheel_T.cpp @@ -11,6 +11,7 @@ #include "ace/Guard_T.h" #include "ace/Timer_Wheel_T.h" #include "ace/Log_Msg.h" +#include "ace/Truncate.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -321,7 +322,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::generate_timer_id (u_in # pragma warning(push) # pragma warning(disable : 4311) #endif /* ACE_WIN64 */ - long next_cnt = reinterpret_cast<long> (root->get_act ()); + long next_cnt = ACE_Utils::truncate_cast<long> ((intptr_t)root->get_act ()); #if defined (ACE_WIN64) # pragma warning(pop) #endif /* ACE_WIN64 */ diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h index d775c5abd6c..38ff9e88a6f 100644 --- a/ACE/ace/Version.h +++ b/ACE/ace/Version.h @@ -5,5 +5,5 @@ #define ACE_MAJOR_VERSION 6 #define ACE_MINOR_VERSION 1 -#define ACE_BETA_VERSION 7 -#define ACE_VERSION "6.1.7" +#define ACE_BETA_VERSION 8 +#define ACE_VERSION "6.1.8" diff --git a/ACE/ace/config-win32-mingw.h b/ACE/ace/config-win32-mingw.h index f711a58665a..f5f75e59f9c 100644 --- a/ACE/ace/config-win32-mingw.h +++ b/ACE/ace/config-win32-mingw.h @@ -28,7 +28,7 @@ #define ACE_HAS_USER_MODE_MASKS -#if (__MINGW32_MAJOR_VERSION < 2) && (__MINGW64_VERSION_MAJOR < 3) +#if (__MINGW32_MAJOR_VERSION < 2) # error You need a newer version (>= 2.0) of mingw32/w32api #endif @@ -38,7 +38,7 @@ # define ACE_FILENO_EQUIVALENT ::_fileno #endif -#if (__MINGW32_MAJOR_VERSION >= 3) || (__MINGW64_VERSION_MAJOR >= 3) +#if (__MINGW32_MAJOR_VERSION >= 3) # define ACE_HAS_SSIZE_T # undef ACE_LACKS_STRUCT_DIR # undef ACE_LACKS_OPENDIR @@ -51,21 +51,8 @@ # define ACE_LACKS_DIRENT_H #endif -#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15)) +#if (__MINGW32_MAJOR_VERSION > 3) || ((__MINGW32_MAJOR_VERSION == 3) && (__MINGW32_MINOR_VERSION >= 15)) # undef ACE_LACKS_USECONDS_T -#elif (__MINGW64_VERSION_MAJOR >= 3) -# undef ACE_LACKS_USECONDS_T -#endif - -#if (__MINGW64_VERSION_MAJOR >= 3) -# define ACE_HAS_POSIX_TIME 1 -# define ACE_LACKS_TIMESPEC_T 1 - -# include <stdlib.h> -# if defined (strtod) -# undef strtod -# endif -#else # if defined (ACE_LACKS_SIGSET_T) # undef ACE_LACKS_SIGSET_T # endif diff --git a/ACE/ace/config-win32-mingw64.h b/ACE/ace/config-win32-mingw64.h new file mode 100644 index 00000000000..7c0971be1fe --- /dev/null +++ b/ACE/ace/config-win32-mingw64.h @@ -0,0 +1,129 @@ +// -*- C++ -*- +// $Id$ + +// +// The following configuration file is designed to work for win32 and win64 +// platforms using gcc/g++ with mingw64 (http://http://mingw-w64.sourceforge.net/). +// + +#ifndef ACE_CONFIG_WIN32_MINGW64_H +#define ACE_CONFIG_WIN32_MINGW64_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 */ + +#define ACE_CC_PREPROCESSOR "cpp" +#define ACE_CC_PREPROCESOR_ARGS "" + +#if !defined(__MINGW32__) || !defined (__MINGW64_VERSION_MAJOR) +# error You do not seem to be using mingw64 +#endif + +#if defined (WIN64) || defined (__WIN64__) +# define ACE_SIZEOF_LONG_DOUBLE 16 +#else +# define ACE_SIZEOF_LONG_DOUBLE 12 +#endif + +#include "ace/config-g++-common.h" + +#include /**/ <_mingw.h> +#include /**/ <w32api.h> + +#if defined (exception_info) +# undef exception_info +#endif + +#define ACE_HAS_USER_MODE_MASKS + +#if (!defined (__MINGW64_VERSION_MAJOR) || (__MINGW64_VERSION_MAJOR < 2)) +# error You need a newer version (>= 2.0) of mingw32/w32api +#endif + +#include <stdio.h> + +#if defined (fileno) +# undef fileno +#endif +#if (__MINGW64_VERSION_MAJOR >= 3) +# define ACE_FILENO_EQUIVALENT ::_fileno +#endif + +#if (__MINGW64_VERSION_MAJOR >= 2) + +# define ACE_HAS_SSIZE_T +# undef ACE_LACKS_STRUCT_DIR +# undef ACE_LACKS_OPENDIR +# undef ACE_LACKS_CLOSEDIR +# undef ACE_LACKS_READDIR +# undef ACE_LACKS_TELLDIR +# undef ACE_LACKS_SEEKDIR +# undef ACE_LACKS_REWINDDIR +# undef ACE_LACKS_USECONDS_T + +# define ACE_HAS_POSIX_TIME 1 +# define ACE_LACKS_TIMESPEC_T 1 +# define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 + +# if defined (ACE_HAS_QOS) && !defined (ACE_HAS_WINSOCK2_GQOS) +# define ACE_HAS_WINSOCK2_GQOS +# endif + +# if defined (WIN64) || defined (__WIN64__) +# define ACE_LACKS_INLINE_ASSEMBLY +# endif + +# include <stdlib.h> +# if defined (strtod) +# undef strtod +# endif + +#else +# define ACE_LACKS_DIRENT_H +#endif // __MINGW64_VERSION_MAJOR >= 3 + +#undef ACE_HAS_WTOF + +#define ACE_LACKS_SYS_SHM_H +#define ACE_LACKS_TERMIOS_H +#define ACE_LACKS_NETINET_TCP_H +#define ACE_LACKS_STRRECVFD +#define ACE_LACKS_STRPTIME +#define ACE_LACKS_POLL_H +#define ACE_LACKS_REGEX_H +#define ACE_LACKS_SYS_MSG_H +#define ACE_LACKS_PWD_H +#define ACE_LACKS_SEMAPHORE_H +#define ACE_LACKS_UCONTEXT_H +#define ACE_LACKS_SYS_SELECT_H +#define ACE_LACKS_SYS_RESOURCE_H +#define ACE_LACKS_SYS_WAIT_H +#define ACE_LACKS_DLFCN_H +#define ACE_LACKS_SYS_MMAN_H +#define ACE_LACKS_SYS_UIO_H +#define ACE_LACKS_SYS_SOCKET_H +#define ACE_LACKS_NETINET_IN_H +#define ACE_LACKS_NETDB_H +#define ACE_LACKS_NET_IF_H +#define ACE_LACKS_SYS_IPC_H +#define ACE_LACKS_SYS_SEM_H +#define ACE_LACKS_STROPTS_H +#define ACE_LACKS_SYS_IOCTL_H +#define ACE_LACKS_PDH_H +#define ACE_LACKS_PDHMSG_H +#define ACE_LACKS_STRTOK_R +#define ACE_LACKS_LOCALTIME_R +#define ACE_HAS_NONCONST_WCSDUP +#define ACE_ISCTYPE_EQUIVALENT ::_isctype + +#define ACE_INT64_FORMAT_SPECIFIER_ASCII "%I64d" +#define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%I64u" + +#define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) (STATUS)) + +#define ACE_DLL_PREFIX ACE_TEXT ("lib") + +#include /**/ "ace/post.h" +#endif /* ACE_CONFIG_WIN32_MINGW64_H */ diff --git a/ACE/ace/config-win32.h b/ACE/ace/config-win32.h index 7cad8a1f1fa..1ada8467838 100644 --- a/ACE/ace/config-win32.h +++ b/ACE/ace/config-win32.h @@ -26,11 +26,15 @@ // Include the config-win32-* file specific to the compiler #if defined (_MSC_VER) -# include "ace/config-win32-msvc.h" +# include "ace/config-win32-msvc.h" #elif defined (ACE_HAS_CEGCC) //need to be prior to MINGW32 -# include "ace/config-win32-cegcc.h" +# include "ace/config-win32-cegcc.h" #elif defined (__MINGW32__) -# include "ace/config-win32-mingw.h" +# if defined (__MINGW64_VERSION_MAJOR) +# include "ace/config-win32-mingw64.h" +# else +# include "ace/config-win32-mingw.h" +# endif #elif defined (__DMC__) # include "ace/config-win32-dmc.h" #else diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp index 7f14f27603e..b91c8026143 100644 --- a/ACE/apps/Gateway/Gateway/Gateway.cpp +++ b/ACE/apps/Gateway/Gateway/Gateway.cpp @@ -7,6 +7,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/Service_Config.h" #include "ace/Signal.h" +#include "ace/Truncate.h" #include "Config_Files.h" #include "Event_Channel.h" #include "Gateway.h" @@ -71,7 +72,7 @@ Gateway::handle_input (ACE_HANDLE h) ACE_OS::read (h, buf, sizeof (buf)); // Shut us down. - return this->handle_signal ((int) h); + return this->handle_signal (ACE_Utils::truncate_cast<int> ((intptr_t)h)); } int diff --git a/ACE/bin/auto_run_tests.pl b/ACE/bin/auto_run_tests.pl index c7f1caf093d..10b38b0b9a1 100755 --- a/ACE/bin/auto_run_tests.pl +++ b/ACE/bin/auto_run_tests.pl @@ -176,6 +176,9 @@ foreach my $test_lst (@file_list) { if (! $is_ace_test) { print "auto_run_tests: $test\n"; + $ENV{COVERITY_TEST_NAME} = $test; + $ENV{COVERITY_SUITE_NAME} = $test_lst; + $ENV{COVERITY_TEST_SOURCE} = "$directory/$program"; } my($orig_dir) = $directory; diff --git a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh index 6389dd876ce..4087013eec1 100755 --- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh +++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh @@ -3,7 +3,7 @@ if test -z $1; then newdate=`date -u +%Y_%m_%d`; else newdate=$1; fi if test -z $2; then prefix=`date -u +%Y%m%d%a`; else prefix=$2; fi -if test -z $3; then olddate=2012_12_27; else olddate=$3; fi +if test -z $3; then olddate=2013_03_14; else olddate=$3; fi if test -z $ACE_ROOT; then ACE_ROOT=..; fi if test -z $TAO_ROOT; then TAO_ROOT=${ACE_ROOT}/TAO; fi if test -z $CIAO_ROOT; then CIAO_ROOT=${TAO_ROOT}/CIAO; fi diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index f916e9263c0..17caee09361 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -1511,11 +1511,9 @@ sub check_for_mismatched_filename () while (<FILE>) { if (m/\@file\s*([^\s]+)/){ # $file includes complete path, $1 is the name after - # @file. We must strip the complete path from $file. - # we do that using the basename function from - # File::BaseName - $filename = basename($file,""); - if (!($filename eq $1)){ + # @file. We must check whether the last part of $file + # is equal to $1 + if ($file !~ /$1$/) { print_error ("$file:$.: \@file mismatch in $file, found $1"); } } diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index 4e717cf3ccc..0ef26368f22 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -915,7 +915,7 @@ def generate_workspaces (stage_dir): mpc_option += ' -relative TAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO ' mpc_option += ' -relative CIAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO ' mpc_option += ' -relative DANCE_ROOT=' + stage_dir + '/ACE_wrappers/TAO/DAnCE ' - msvc_exclude_option = ' -exclude TAO/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc,TAO/CIAO/CIAO_TAO_OpenDDS.mwc ' + msvc_exclude_option = ' -exclude TAO/CIAO/CIAO_TAO_DAnCE_OpenDDS.mwc,TAO/CIAO/CIAO_TAO_OpenDDS.mwc,TAO/CIAO/CIAO_TAO_DAnCE_OpenDDS_shapes.mwc ' vc10_option = ' -name_modifier *_vc10 ' vc9_option = ' -name_modifier *_vc9 ' diff --git a/ACE/debian/ace.dsc b/ACE/debian/ace.dsc index 81ce56052f1..99501edf5ea 100644 --- a/ACE/debian/ace.dsc +++ b/ACE/debian/ace.dsc @@ -1,10 +1,10 @@ Format: 1.0 -Source: ACE+TAO+CIAO-src-6.1.7 -Version: 2.1.7 +Source: ACE+TAO+CIAO-src-6.1.8 +Version: 2.1.8 Binary: ace Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> Architecture: any -Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz +Build-Depends: gcc, make, g++, debhelper (>= 5), dpkg-dev, libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev, zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz, libfox-1.6-dev, libzzip-dev, libbz2-dev Files: - 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-6.1.7.tar.gz + e32db91fd4f3ca1e9cd07d77afb9d8d2 45290746 ACE+TAO+CIAO-src-6.1.8.tar.gz diff --git a/ACE/debian/debian.changelog b/ACE/debian/debian.changelog index bd10dc517d8..fc255bb7d0a 100644 --- a/ACE/debian/debian.changelog +++ b/ACE/debian/debian.changelog @@ -1,3 +1,9 @@ +ace (6.1.8-1) experimental; urgency=low + + * New upstream release. + + -- Johnny Willemsen <jwillemsen@remedy.nl> Thu, 04 Apr 2013 19:01:01 +0200 + ace (6.1.7-1) experimental; urgency=low * New upstream release. diff --git a/ACE/debian/debian.control b/ACE/debian/debian.control index eb5bd5f260b..e72113e0e7d 100644 --- a/ACE/debian/debian.control +++ b/ACE/debian/debian.control @@ -28,7 +28,7 @@ Description: makefile, project, and workspace creator * mpc-ace: generates project files for a single target * mwc-ace: generates workspace files for a set of projects -Package: libace-6.1.7 +Package: libace-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -46,7 +46,7 @@ Description: C++ network programming framework Package: libace-dev Architecture: any Section: libdevel -Depends: libace-6.1.7 (= ${binary:Version}), ${misc:Depends} +Depends: libace-6.1.8 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, libtao-dev, pkg-config Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework - development files @@ -63,7 +63,7 @@ Description: C++ network programming framework - documentation This package contains the ACE overview documentation, tutorials, examples, and information regarding upstream development. -Package: libace-ssl-6.1.7 +Package: libace-ssl-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -74,12 +74,12 @@ Description: ACE secure socket layer library Package: libace-ssl-dev Architecture: any Section: libdevel -Depends: libace-ssl-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends} +Depends: libace-ssl-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev (>= 0.9.7d), ${misc:Depends} Description: ACE secure socket layer library - development files This package contains the header files and static library for the ACE SSL library. -Package: libace-rmcast-6.1.7 +Package: libace-rmcast-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -93,12 +93,12 @@ Description: ACE reliable multicast library Package: libace-rmcast-dev Architecture: any Section: libdevel -Depends: libace-rmcast-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-rmcast-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE reliable multicast library - development files This package contains the header files and static library for the ACE reliable multicast library. -Package: libace-tmcast-6.1.7 +Package: libace-tmcast-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -112,12 +112,12 @@ Description: ACE transactional multicast library Package: libace-tmcast-dev Architecture: any Section: libdevel -Depends: libace-tmcast-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-tmcast-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE transactional multicast library - development files This package contains the header files and static library for the ACE transactional multicast library. -Package: libace-htbp-6.1.7 +Package: libace-htbp-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -131,12 +131,12 @@ Description: ACE protocol over HTTP tunneling library Package: libace-htbp-dev Architecture: any Section: libdevel -Depends: libace-htbp-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-htbp-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE protocol over HTTP tunneling library - development files This package contains the header files and static library for the ACE HTBP library. -Package: libace-inet-6.1.7 +Package: libace-inet-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -147,15 +147,15 @@ Description: ACE Inet protocol library Package: libace-inet-dev Architecture: any Section: libdevel -Depends: libace-inet-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE Inet protocol library - development files This package contains the header files and static library for the ACE Inet protocol library. -Package: libace-inet-ssl-6.1.7 +Package: libace-inet-ssl-6.1.8 Architecture: any Section: libs -Depends: libace-inet-6.1.7, libace-ssl-6.1.7, ${shlibs:Depends}, ${misc:Depends} +Depends: libace-inet-6.1.8, libace-ssl-6.1.8, ${shlibs:Depends}, ${misc:Depends} Description: ACE SSL-enabled Inet protocol library This package provides an ACE addon library for clients (and possibly servers at some point) using Inet protocols which support SSL, such as @@ -164,7 +164,7 @@ Description: ACE SSL-enabled Inet protocol library Package: libace-inet-ssl-dev Architecture: any Section: libdevel -Depends: libace-inet-ssl-6.1.7 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} +Depends: libace-inet-ssl-6.1.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SSL-enabled Inet protocol library - development files This package contains the header files and static library for the ACE SSL-enabled Inet protocol library. @@ -191,7 +191,7 @@ Description: ACE perfect hash function generator (transitional package) . It can be safely removed after installation. -Package: libacexml-6.1.7 +Package: libacexml-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -207,16 +207,16 @@ Package: libacexml-dev Architecture: any Section: libdevel Replaces: libace-dev (<< 5.7.7-4) -Depends: libacexml-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libacexml-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE SAX based XML parsing library - development files This package contains the header files and static library for the ACE XML parsing library. -Package: libkokyu-6.1.7 +Package: libkokyu-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: libtao-2.1.2, libtao-orbsvcs-2.1.7 +Suggests: libtao-2.1.8, libtao-orbsvcs-2.1.8 Description: ACE scheduling and dispatching library Kokyu is a library designed to provide flexible scheduling and dispatching services. @@ -227,12 +227,12 @@ Description: ACE scheduling and dispatching library Package: libkokyu-dev Architecture: any Section: libdevel -Depends: libkokyu-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libkokyu-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Description: ACE scheduling and dispatching library - development files This package contains the header files and static library for the ACE scheduling and dispatching library. -Package: libace-qtreactor-6.1.7 +Package: libace-qtreactor-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -251,12 +251,12 @@ Description: ACE-GUI reactor integration for Qt Package: libace-qtreactor-dev Architecture: any Section: libdevel -Depends: libace-qtreactor-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends} +Depends: libace-qtreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libqt4-dev, ${misc:Depends} Description: ACE-GUI reactor integration for Qt - development files This package contains header files and static library for the ACE-Qt reactor integration. -Package: libace-xtreactor-6.1.7 +Package: libace-xtreactor-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -274,12 +274,12 @@ Description: ACE-GUI reactor integration for Xt Package: libace-xtreactor-dev Architecture: any Section: libdevel -Depends: libace-xtreactor-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.7), ${misc:Depends} +Depends: libace-xtreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 6.1.7), ${misc:Depends} Description: ACE-GUI reactor integration for Xt - development files This package contains header files and static library for the ACE-Xt reactor integration. -Package: libace-tkreactor-6.1.7 +Package: libace-tkreactor-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -298,12 +298,12 @@ Description: ACE-GUI reactor integration for Tk Package: libace-tkreactor-dev Architecture: any Section: libdevel -Depends: libace-tkreactor-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} +Depends: libace-tkreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends} Description: ACE-GUI reactor integration for Tk - development files This package contains header files and static library for the ACE-Tk reactor integration. -Package: libace-flreactor-6.1.7 +Package: libace-flreactor-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -321,12 +321,12 @@ Description: ACE-GUI reactor integration for Fl Package: libace-flreactor-dev Architecture: any Section: libdevel -Depends: libace-flreactor-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.7), ${misc:Depends} +Depends: libace-flreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 6.1.8), ${misc:Depends} Description: ACE-GUI reactor integration for Fl - development files This package contains header files and static library for the ACE-Fl reactor integration. -Package: libace-foxreactor-6.1.7 +Package: libace-foxreactor-6.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -343,12 +343,12 @@ Description: ACE-GUI reactor integration for FOX Package: libace-foxreactor-dev Architecture: any Section: libdevel -Depends: libace-foxreactor-6.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} +Depends: libace-foxreactor-6.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends} Description: ACE-GUI reactor integration for FOX - development files This package contains header files and static library for the ACE-FOX reactor integration. -Package: libtao-2.1.7 +Package: libtao-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -363,7 +363,7 @@ Package: libtao-dev Architecture: any Section: libdevel Replaces: libtao-orbsvcs-dev (<< 5.7.7-4) -Depends: libtao-2.1.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-2.1.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends} Suggests: libtao-doc, libtao-orbsvcs-dev Description: ACE based CORBA ORB core libraries - development files This package contains the header files for TAO. Due to the size of @@ -379,7 +379,7 @@ Description: ACE based CORBA ORB core libraries - documentation This package contains the TAO overview documentation, tutorials, examples, and information regarding upstream development. -Package: libtao-orbsvcs-2.1.7 +Package: libtao-orbsvcs-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -390,14 +390,14 @@ Package: libtao-orbsvcs-dev Architecture: any Section: libdevel Replaces: libtao-dev (<< 5.7.7-4) -Depends: libtao-orbsvcs-2.1.7 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-orbsvcs-2.1.8 (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO CORBA services - development files This package contains the header files for the TAO CORBA services. . The examples and some documentation have been included as well, but the static libraries have been left out due to their size (over 400MB). -Package: libtao-qtresource-2.1.7 +Package: libtao-qtresource-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -408,12 +408,12 @@ Description: TAO-GUI reactor integration for Qt Package: libtao-qtresource-dev Architecture: any Section: libdevel -Depends: libtao-qtresource-2.1.7 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-qtresource-2.1.8 (= ${binary:Version}), libace-qtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Qt - development files This package contains header files and static library for the TAO-Qt reactor integration. -Package: libtao-xtresource-2.1.7 +Package: libtao-xtresource-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -424,12 +424,12 @@ Description: TAO-GUI reactor integration for Xt Package: libtao-xtresource-dev Architecture: any Section: libdevel -Depends: libtao-xtresource-2.1.7 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-xtresource-2.1.8 (= ${binary:Version}), libace-xtreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Xt - development files This package contains header files and static library for the TAO-Xt reactor integration. -Package: libtao-flresource-2.1.7 +Package: libtao-flresource-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -440,12 +440,12 @@ Description: TAO-GUI reactor integration for Fl Package: libtao-flresource-dev Architecture: any Section: libdevel -Depends: libtao-flresource-2.1.7 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-flresource-2.1.8 (= ${binary:Version}), libace-flreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Fl - development files This package contains header files and static library for the TAO-Fl reactor integration. -Package: libtao-tkresource-2.1.7 +Package: libtao-tkresource-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -456,12 +456,12 @@ Description: TAO-GUI reactor integration for Tk Package: libtao-tkresource-dev Architecture: any Section: libdevel -Depends: libtao-tkresource-2.1.7 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-tkresource-2.1.8 (= ${binary:Version}), libace-tkreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for Tk - development files This package contains header files and static library for the TAO-Tk reactor integration. -Package: libtao-foxresource-2.1.7 +Package: libtao-foxresource-2.1.8 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -472,14 +472,14 @@ Description: TAO-GUI reactor integration for FOX Package: libtao-foxresource-dev Architecture: any Section: libdevel -Depends: libtao-foxresource-2.1.7 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} +Depends: libtao-foxresource-2.1.8 (= ${binary:Version}), libace-foxreactor-dev (= ${binary:Version}), libtao-dev (= ${binary:Version}), ${misc:Depends} Description: TAO-GUI reactor integration for FOX - development files This package contains header files and static library for the TAO-FOX reactor integration. Package: tao-idl Architecture: any -Depends: g++, libtao-2.1.7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: g++, libtao-2.1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO IDL to C++ compiler This package provides an Interface Definition Language (IDL) to C++ compiler. @@ -489,7 +489,7 @@ Description: TAO IDL to C++ compiler Package: tao-ifr Architecture: any -Depends: g++, libtao-2.1.7 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: g++, libtao-2.1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Description: TAO interface repository CORBA-aware programs can contact an interface repository to get objects' interfaces at run-time. Then they can use the Dynamic diff --git a/ACE/debian/libace-6.1.7.docs b/ACE/debian/libace-6.1.8.docs index 3bdab5b0089..3bdab5b0089 100644 --- a/ACE/debian/libace-6.1.7.docs +++ b/ACE/debian/libace-6.1.8.docs diff --git a/ACE/debian/libace-6.1.7.install b/ACE/debian/libace-6.1.8.install index d9afda38c12..d9afda38c12 100644 --- a/ACE/debian/libace-6.1.7.install +++ b/ACE/debian/libace-6.1.8.install diff --git a/ACE/debian/libace-flreactor-6.1.7.install b/ACE/debian/libace-flreactor-6.1.8.install index 528836aacee..528836aacee 100644 --- a/ACE/debian/libace-flreactor-6.1.7.install +++ b/ACE/debian/libace-flreactor-6.1.8.install diff --git a/ACE/debian/libace-foxreactor-6.1.7.install b/ACE/debian/libace-foxreactor-6.1.8.install index e360f29f5af..e360f29f5af 100644 --- a/ACE/debian/libace-foxreactor-6.1.7.install +++ b/ACE/debian/libace-foxreactor-6.1.8.install diff --git a/ACE/debian/libace-htbp-6.1.7.install b/ACE/debian/libace-htbp-6.1.8.install index 08103fd5cad..08103fd5cad 100644 --- a/ACE/debian/libace-htbp-6.1.7.install +++ b/ACE/debian/libace-htbp-6.1.8.install diff --git a/ACE/debian/libace-inet-6.1.7.install b/ACE/debian/libace-inet-6.1.8.install index 59a73a509d0..59a73a509d0 100644 --- a/ACE/debian/libace-inet-6.1.7.install +++ b/ACE/debian/libace-inet-6.1.8.install diff --git a/ACE/debian/libace-inet-ssl-6.1.7.install b/ACE/debian/libace-inet-ssl-6.1.8.install index b9b8b9045f7..b9b8b9045f7 100644 --- a/ACE/debian/libace-inet-ssl-6.1.7.install +++ b/ACE/debian/libace-inet-ssl-6.1.8.install diff --git a/ACE/debian/libace-qtreactor-6.1.7.install b/ACE/debian/libace-qtreactor-6.1.8.install index 1d371e1e571..1d371e1e571 100644 --- a/ACE/debian/libace-qtreactor-6.1.7.install +++ b/ACE/debian/libace-qtreactor-6.1.8.install diff --git a/ACE/debian/libace-rmcast-6.1.7.install b/ACE/debian/libace-rmcast-6.1.8.install index 86e78259853..86e78259853 100644 --- a/ACE/debian/libace-rmcast-6.1.7.install +++ b/ACE/debian/libace-rmcast-6.1.8.install diff --git a/ACE/debian/libace-ssl-6.1.7.NEWS b/ACE/debian/libace-ssl-6.1.8.NEWS index e5bd0e4aa10..e5bd0e4aa10 100644 --- a/ACE/debian/libace-ssl-6.1.7.NEWS +++ b/ACE/debian/libace-ssl-6.1.8.NEWS diff --git a/ACE/debian/libace-ssl-6.1.7.install b/ACE/debian/libace-ssl-6.1.8.install index 8df45a6d55f..8df45a6d55f 100644 --- a/ACE/debian/libace-ssl-6.1.7.install +++ b/ACE/debian/libace-ssl-6.1.8.install diff --git a/ACE/debian/libace-tkreactor-6.1.7.install b/ACE/debian/libace-tkreactor-6.1.8.install index 12ab35062d2..12ab35062d2 100644 --- a/ACE/debian/libace-tkreactor-6.1.7.install +++ b/ACE/debian/libace-tkreactor-6.1.8.install diff --git a/ACE/debian/libace-tmcast-6.1.7.install b/ACE/debian/libace-tmcast-6.1.8.install index e066131dea0..e066131dea0 100644 --- a/ACE/debian/libace-tmcast-6.1.7.install +++ b/ACE/debian/libace-tmcast-6.1.8.install diff --git a/ACE/debian/libace-xml-utils-6.1.7.install b/ACE/debian/libace-xml-utils-6.1.8.install index 2428ec9f109..2428ec9f109 100644 --- a/ACE/debian/libace-xml-utils-6.1.7.install +++ b/ACE/debian/libace-xml-utils-6.1.8.install diff --git a/ACE/debian/libace-xtreactor-6.1.7.install b/ACE/debian/libace-xtreactor-6.1.8.install index c53614c7208..c53614c7208 100644 --- a/ACE/debian/libace-xtreactor-6.1.7.install +++ b/ACE/debian/libace-xtreactor-6.1.8.install diff --git a/ACE/debian/libacexml-6.1.7.docs b/ACE/debian/libacexml-6.1.8.docs index 002855d7915..002855d7915 100644 --- a/ACE/debian/libacexml-6.1.7.docs +++ b/ACE/debian/libacexml-6.1.8.docs diff --git a/ACE/debian/libacexml-6.1.7.install b/ACE/debian/libacexml-6.1.8.install index d3e912ffa51..d3e912ffa51 100644 --- a/ACE/debian/libacexml-6.1.7.install +++ b/ACE/debian/libacexml-6.1.8.install diff --git a/ACE/debian/libkokyu-6.1.7.docs b/ACE/debian/libkokyu-6.1.8.docs index e8869c513b2..e8869c513b2 100644 --- a/ACE/debian/libkokyu-6.1.7.docs +++ b/ACE/debian/libkokyu-6.1.8.docs diff --git a/ACE/debian/libkokyu-6.1.7.install b/ACE/debian/libkokyu-6.1.8.install index 62854308f96..62854308f96 100644 --- a/ACE/debian/libkokyu-6.1.7.install +++ b/ACE/debian/libkokyu-6.1.8.install diff --git a/ACE/debian/libtao-2.1.7.docs b/ACE/debian/libtao-2.1.8.docs index 803353aba72..803353aba72 100644 --- a/ACE/debian/libtao-2.1.7.docs +++ b/ACE/debian/libtao-2.1.8.docs diff --git a/ACE/debian/libtao-2.1.7.install b/ACE/debian/libtao-2.1.8.install index a80041c6986..a80041c6986 100644 --- a/ACE/debian/libtao-2.1.7.install +++ b/ACE/debian/libtao-2.1.8.install diff --git a/ACE/debian/libtao-flresource-2.1.7.install b/ACE/debian/libtao-flresource-2.1.8.install index 5d4ee6ce57a..5d4ee6ce57a 100644 --- a/ACE/debian/libtao-flresource-2.1.7.install +++ b/ACE/debian/libtao-flresource-2.1.8.install diff --git a/ACE/debian/libtao-foxresource-2.1.7.install b/ACE/debian/libtao-foxresource-2.1.8.install index 6ceb47601aa..6ceb47601aa 100644 --- a/ACE/debian/libtao-foxresource-2.1.7.install +++ b/ACE/debian/libtao-foxresource-2.1.8.install diff --git a/ACE/debian/libtao-orbsvcs-2.1.7.NEWS b/ACE/debian/libtao-orbsvcs-2.1.8.NEWS index ea0759e0ade..ea0759e0ade 100644 --- a/ACE/debian/libtao-orbsvcs-2.1.7.NEWS +++ b/ACE/debian/libtao-orbsvcs-2.1.8.NEWS diff --git a/ACE/debian/libtao-orbsvcs-2.1.7.install b/ACE/debian/libtao-orbsvcs-2.1.8.install index e0e491e9095..e0e491e9095 100644 --- a/ACE/debian/libtao-orbsvcs-2.1.7.install +++ b/ACE/debian/libtao-orbsvcs-2.1.8.install diff --git a/ACE/debian/libtao-qtresource-2.1.7.install b/ACE/debian/libtao-qtresource-2.1.8.install index 172f4c45db8..172f4c45db8 100644 --- a/ACE/debian/libtao-qtresource-2.1.7.install +++ b/ACE/debian/libtao-qtresource-2.1.8.install diff --git a/ACE/debian/libtao-tkresource-2.1.7.install b/ACE/debian/libtao-tkresource-2.1.8.install index 7f543154b5b..7f543154b5b 100644 --- a/ACE/debian/libtao-tkresource-2.1.7.install +++ b/ACE/debian/libtao-tkresource-2.1.8.install diff --git a/ACE/debian/libtao-xtresource-2.1.7.install b/ACE/debian/libtao-xtresource-2.1.8.install index ab5151ed073..ab5151ed073 100644 --- a/ACE/debian/libtao-xtresource-2.1.7.install +++ b/ACE/debian/libtao-xtresource-2.1.8.install diff --git a/ACE/docs/ACE-bug-process.html b/ACE/docs/ACE-bug-process.html index a703c0072f6..d161b36fc1a 100644 --- a/ACE/docs/ACE-bug-process.html +++ b/ACE/docs/ACE-bug-process.html @@ -173,7 +173,7 @@ HREF="../tests">ACE_ROOT/tests</A> directory. <P> <A HREF="http://www.dre.vanderbilt.edu/scoreboard">autobuild scoreboard</A> please consider contributing one or more autobuilds that can be used to keep track of changes to your platform/compiler -combiation and ensure things continue to work as the ACE+TAO source +combination and ensure things continue to work as the ACE+TAO source code evolves. <P> <LI> By submitting bug fixes submitters acknowledge that they have the diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html index 011337a6c65..7fcc2fe4b94 100644 --- a/ACE/docs/Download.html +++ b/ACE/docs/Download.html @@ -101,128 +101,128 @@ of the ACE, TAO, and CIAO micro release kit is available for <TR><TH>Filename</TH><TH>Description</TH><TH>Full</TH><TH>Sources only</TH></TR> <TR><TD>ACE+TAO+CIAO.tar.gz</TD> <TD>ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+CIAO.tar.bz2</TD> <TD>ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+CIAO.zip</TD> <TD>ACE+TAO+CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-6.1.8.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-6.1.8.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.gz</TD> <TD>ACE+TAO+DAnCE (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.tar.bz2</TD> <TD>ACE+TAO+DAnCE (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO+DAnCE.zip</TD> <TD>ACE+TAO+DAnCE (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-6.1.8.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+DAnCE-src-6.1.8.zip">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.gz</TD> <TD>ACE+TAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.tar.bz2</TD> <TD>ACE+TAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE+TAO.zip</TD> <TD>ACE+TAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-6.1.8.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-6.1.8.zip">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.gz</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE-html.tar.bz2</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE-html.zip</TD> <TD>Doxygen documentation for ACE+TAO+CIAO (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-6.1.8.zip">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.gz</TD> <TD>ACE only (tar+gzip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.gz">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.7.tar.gz">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.7.tar.gz">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.gz">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.gz">FTP</A>] </TD> </TR> <TR><TD>ACE.tar.bz2</TD> <TD>ACE only (tar+bzip2 format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.tar.bz2">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.7.tar.bz2">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.7.tar.bz2">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.bz2">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.tar.bz2">FTP</A>] </TD> </TR> <TR><TD>ACE.zip</TD> <TD>ACE only (zip format)</TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-6.1.8.zip">FTP</A>] </TD> - <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.7.zip">HTTP</A>] - [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.7.zip">FTP</A>] + <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.zip">HTTP</A>] + [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-6.1.8.zip">FTP</A>] </TD> </TR> </TABLE> diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index 673b693d566..eff7e8e7983 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -225,7 +225,7 @@ <p><code>$ ssh ..<br> No default printer<br> screen<br> - cd /tmp<br> + cd $HOME<br> rm -rf DOC_ROOT<br> mkdir DOC_ROOT<br> export DOC_ROOT=$PWD/DOC_ROOT<br> @@ -311,15 +311,15 @@ </li></ul> <code> screen<br> - cd /tmp<br> + cd $HOME<br> rm -rf doxygen<br> mkdir doxygen<br> cd doxygen<br> wget https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/docs/svn/config?view=co -O $HOME/.subversion/config<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_7/ACE ACE_wrappers<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_7/TAO ACE_wrappers/TAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_7/CIAO ACE_wrappers/TAO/CIAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_7/DAnCE ACE_wrappers/TAO/DAnCE<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/ACE ACE_wrappers<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/TAO ACE_wrappers/TAO<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/CIAO ACE_wrappers/TAO/CIAO<br> + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-6_1_8/DAnCE ACE_wrappers/TAO/DAnCE<br> cd ACE_wrappers<br> export ACE_ROOT=$PWD<br> export TAO_ROOT=$ACE_ROOT/TAO<br> diff --git a/ACE/etc/index.html b/ACE/etc/index.html index 85cece6e762..6aec7cfc267 100644 --- a/ACE/etc/index.html +++ b/ACE/etc/index.html @@ -35,6 +35,7 @@ <hr> We do have the documentation for previous releases <ul> + <LI><P><A HREF="6.1.8/html">6.1.8</A></P></LI> <LI><P><A HREF="6.1.7/html">6.1.7</A></P></LI> <LI><P><A HREF="6.1.6/html">6.1.6</A></P></LI> <LI><P><A HREF="6.1.5/html">6.1.5</A></P></LI> diff --git a/ACE/examples/C++NPv1/Reactive_Logging_Server.h b/ACE/examples/C++NPv1/Reactive_Logging_Server.h index e7558a16e34..ccabc6a88fe 100644 --- a/ACE/examples/C++NPv1/Reactive_Logging_Server.h +++ b/ACE/examples/C++NPv1/Reactive_Logging_Server.h @@ -13,6 +13,7 @@ #include "ace/Log_Record.h" #include "ace/Handle_Set.h" #include "ace/Basic_Types.h" +#include "ace/Truncate.h" #include "ace/os_include/os_fcntl.h" #include "Iterative_Logging_Server.h" @@ -35,7 +36,7 @@ protected: virtual int wait_for_multiple_events () { active_handles_ = master_handle_set_; - int width = (int)active_handles_.max_set () + 1; + int width = ACE_Utils::truncate_cast<int> ((intptr_t)active_handles_.max_set ()) + 1; if (select (width, active_handles_.fdset (), 0, // no write_fds diff --git a/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h b/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h index c839b2453fc..31f25498b7e 100644 --- a/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h +++ b/ACE/examples/C++NPv1/Reactive_Logging_Server_Ex.h @@ -18,6 +18,7 @@ #include "Logging_Server.h" #include "Logging_Handler.h" #include "ace/Null_Mutex.h" +#include "ace/Truncate.h" #include "ace/os_include/os_fcntl.h" typedef ACE_Hash_Map_Manager<ACE_HANDLE, @@ -46,7 +47,7 @@ protected: virtual int wait_for_multiple_events () { active_read_handles_ = master_handle_set_; - int width = (int) active_read_handles_.max_set () + 1; + int width = ACE_Utils::truncate_cast<int> ((intptr_t)active_read_handles_.max_set ()) + 1; return ACE::select (width, active_read_handles_); } diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp index 608745d721f..314c004cdb4 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.cpp @@ -9,23 +9,14 @@ #include "ace/OS_NS_unistd.h" #include "ace/Signal.h" - - -#define PR_ST_1 ACE_PEER_STREAM_1 -#define PR_ST_2 ACE_PEER_STREAM_2 -#define PR_AC_1 ACE_PEER_ACCEPTOR_1 -#define PR_AC_2 ACE_PEER_ACCEPTOR_2 -#define PR_AD ACE_PEER_STREAM_ADDR -#define SVH SVC_HANDLER - -template <PR_ST_1> -Svc_Handler<PR_ST_2>::Svc_Handler (ACE_Reactor *r) +template <typename PEER_STREAM> +Svc_Handler<PEER_STREAM>::Svc_Handler (ACE_Reactor *r) : SVC_HANDLER (0, 0, r) { } -template <PR_ST_1> int -Svc_Handler<PR_ST_2>::close (u_long) +template <typename PEER_STREAM> int +Svc_Handler<PEER_STREAM>::close (u_long) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("calling Svc_Handler close\n"))); @@ -34,10 +25,10 @@ Svc_Handler<PR_ST_2>::close (u_long) return 0; } -template <PR_ST_1> int -Svc_Handler<PR_ST_2>::open (void *) +template <typename PEER_STREAM> int +Svc_Handler<PEER_STREAM>::open (void *) { - PR_AD client_addr; + typename PEER_STREAM::PEER_ADDR client_addr; ACE_TCHAR buf[BUFSIZ]; if (this->peer ().get_remote_addr (client_addr) == -1) @@ -64,8 +55,8 @@ Svc_Handler<PR_ST_2>::open (void *) // Receive and process the data from the client. -template <PR_ST_1> int -Svc_Handler<PR_ST_2>::handle_input (ACE_HANDLE) +template <typename PEER_STREAM> int +Svc_Handler<PEER_STREAM>::handle_input (ACE_HANDLE) { char buf[BUFSIZ]; @@ -94,16 +85,16 @@ Svc_Handler<PR_ST_2>::handle_input (ACE_HANDLE) return 0; } -template <PR_ST_1> int -Svc_Handler<PR_ST_2>::handle_timeout (const ACE_Time_Value &, +template <typename PEER_STREAM> int +Svc_Handler<PEER_STREAM>::handle_timeout (const ACE_Time_Value &, const void *) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%p\n"), ACE_TEXT ("handle_timeout"))); return 0; } -template <class SVH, PR_AC_1> int -IPC_Server<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[]) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::init (int argc, ACE_TCHAR *argv[]) { const ACE_TCHAR *local_addr = argc > 1 ? argv[1] @@ -155,25 +146,25 @@ IPC_Server<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[]) return 0; } -template <class SVH, PR_AC_1> -IPC_Server<SVH, PR_AC_2>::IPC_Server (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::IPC_Server (void) : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } -template <class SVH, PR_AC_1> int -IPC_Server<SVH, PR_AC_2>::fini (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::fini (void) { return 0; } -template <class SVH, PR_AC_1> -IPC_Server<SVH, PR_AC_2>::~IPC_Server (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::~IPC_Server (void) { } -template <class SVH, PR_AC_1> int -IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle, +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask) { ACE_UNUSED_ARG (handle); @@ -186,8 +177,8 @@ IPC_Server<SVH, PR_AC_2>::handle_close (ACE_HANDLE handle, // Run the interative service. -template <class SVH, PR_AC_1> int -IPC_Server<SVH, PR_AC_2>::svc (void) +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> int +IPC_Server<SVC_HANDLER, PEER_ACCEPTOR>::svc (void) { ACE_TCHAR buf[BUFSIZ]; @@ -207,9 +198,9 @@ IPC_Server<SVH, PR_AC_2>::svc (void) while (ACE_Reactor::event_loop_done () == 0) { - SVH sh (this->reactor ()); + SVC_HANDLER sh (this->reactor ()); - // Create a new <SVH> endpoint, which performs all processing in + // Create a new <SVC_HANDLER> endpoint, which performs all processing in // its <open> method (note no automatic restart if errno == // EINTR). @@ -230,7 +221,7 @@ IPC_Server<SVH, PR_AC_2>::svc (void) this->acceptor ().get_handle ())); } - // <SVH>'s destructor closes the stream implicitly but the + // <SVC_HANDLER>'s destructor closes the stream implicitly but the // listening endpoint stays open. } @@ -238,10 +229,4 @@ IPC_Server<SVH, PR_AC_2>::svc (void) return 0; } -#undef PR_ST_1 -#undef PR_ST_2 -#undef PR_AC_1 -#undef PR_AC_2 -#undef PR_AD -#undef SVH #endif /* CPP_ACCEPTOR_C */ diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h index c06caf50b48..7d3ccfd4be4 100644 --- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h +++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h @@ -13,9 +13,8 @@ #include "ace/Svc_Handler.h" #include "ace/Sig_Adapter.h" - -template <ACE_PEER_STREAM_1> -class Svc_Handler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> +template <typename PEER_STREAM> +class Svc_Handler : public ACE_Svc_Handler <PEER_STREAM, ACE_NULL_SYNCH> { // = TITLE // This class does the work once the <ACE_Oneshot_Acceptor> has @@ -37,12 +36,12 @@ public: // Handles acceptor timeouts. private: - typedef ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH> + typedef ACE_Svc_Handler <PEER_STREAM, ACE_NULL_SYNCH> SVC_HANDLER; }; -template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1> -class IPC_Server : public ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> +template <typename SVC_HANDLER, typename PEER_ACCEPTOR> +class IPC_Server : public ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR> { // = TITLE // This class illustrates how the <ACE_Oneshot_Acceptor> works. @@ -71,10 +70,10 @@ public: // Run the interative service. private: - typedef ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2> + typedef ACE_Oneshot_Acceptor<SVC_HANDLER, PEER_ACCEPTOR> inherited; - ACE_PEER_ACCEPTOR_ADDR server_addr_; + typename PEER_ACCEPTOR::PEER_ADDR server_addr_; // Address of this server. ACE_Synch_Options options_; diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.cpp b/ACE/examples/Connection/non_blocking/CPP-connector.cpp index a856a88f8af..eb92e82bd2b 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.cpp +++ b/ACE/examples/Connection/non_blocking/CPP-connector.cpp @@ -8,29 +8,20 @@ #include "ace/OS_NS_unistd.h" #include "ace/Signal.h" - - -#define PR_ST_1 ACE_PEER_STREAM_1 -#define PR_ST_2 ACE_PEER_STREAM_2 -#define PR_CO_1 ACE_PEER_CONNECTOR_1 -#define PR_CO_2 ACE_PEER_CONNECTOR_2 -#define PR_AD ACE_PEER_CONNECTOR_ADDR -#define SVH SVC_HANDLER - -template <PR_ST_1> -Peer_Handler<PR_ST_2>::Peer_Handler (ACE_Reactor *r) - : action_ (&Peer_Handler<PR_ST_2>::uninitialized) +template <typename PEER_STREAM> +Peer_Handler<PEER_STREAM>::Peer_Handler (ACE_Reactor *r) + : action_ (&Peer_Handler<PEER_STREAM>::uninitialized) { this->reactor (r); } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::open (void *) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::open (void *) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("activating %d\n"), this->peer ().get_handle ())); - this->action_ = &Peer_Handler<PR_ST_2>::connected; + this->action_ = &Peer_Handler<PEER_STREAM>::connected; ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("please enter input..: "))); @@ -59,8 +50,8 @@ Peer_Handler<PR_ST_2>::open (void *) return 0; } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::close (u_long) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::close (u_long) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Connect not successful: ending reactor event loop\n"))); @@ -68,15 +59,15 @@ Peer_Handler<PR_ST_2>::close (u_long) return 0; } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::uninitialized (void) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::uninitialized (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("uninitialized!\n"))); return 0; } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::connected (void) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::connected (void) { char buf[BUFSIZ]; @@ -106,8 +97,8 @@ Peer_Handler<PR_ST_2>::connected (void) } } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::stdio (void) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::stdio (void) { char buf[BUFSIZ]; @@ -131,26 +122,26 @@ Peer_Handler<PR_ST_2>::stdio (void) return -1; } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::handle_timeout (const ACE_Time_Value &, +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::handle_timeout (const ACE_Time_Value &, const void *) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("Connect timedout. "))); return this->close (); } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::handle_output (ACE_HANDLE) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::handle_output (ACE_HANDLE) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("in handle_output\n"))); return (this->*action_) (); } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::handle_signal (int, - siginfo_t *, - ucontext_t *) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::handle_signal (int, + siginfo_t *, + ucontext_t *) { // @@ Note that this code is not portable to all OS platforms since // it uses print statements within signal handler context. @@ -159,16 +150,16 @@ Peer_Handler<PR_ST_2>::handle_signal (int, return (this->*action_) (); } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::handle_input (ACE_HANDLE) +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::handle_input (ACE_HANDLE) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("in handle_input\n"))); return (this->*action_) (); } -template <PR_ST_1> int -Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE h, +template <typename PEER_STREAM> int +Peer_Handler<PEER_STREAM>::handle_close (ACE_HANDLE h, ACE_Reactor_Mask mask) { ACE_DEBUG ((LM_DEBUG, @@ -176,7 +167,7 @@ Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE h, h, mask)); - if (this->action_ == &Peer_Handler<PR_ST_2>::stdio) + if (this->action_ == &Peer_Handler<PEER_STREAM>::stdio) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("moving to closed state\n"))); this->reactor ()->end_reactor_event_loop (); @@ -184,7 +175,7 @@ Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE h, else { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("moving to stdio state\n"))); - this->action_ = &Peer_Handler<PR_ST_2>::stdio; + this->action_ = &Peer_Handler<PEER_STREAM>::stdio; this->peer ().close (); ACE_OS::rewind (stdin); @@ -208,8 +199,8 @@ Peer_Handler<PR_ST_2>::handle_close (ACE_HANDLE h, return 0; } -template <class SVH, PR_CO_1> int -IPC_Client<SVH, PR_CO_2>::svc (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::svc (void) { if (this->reactor ()) this->reactor ()->run_reactor_event_loop (); @@ -217,20 +208,20 @@ IPC_Client<SVH, PR_CO_2>::svc (void) return 0; } -template <class SVH, PR_CO_1> int -IPC_Client<SVH, PR_CO_2>::fini (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::fini (void) { return 0; } -template <class SVH, PR_CO_1> -IPC_Client<SVH, PR_CO_2>::IPC_Client (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::IPC_Client (void) : done_handler_ (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop)) { } -template <class SVH, PR_CO_1> int -IPC_Client<SVH, PR_CO_2>::init (int argc, ACE_TCHAR *argv[]) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> int +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::init (int argc, ACE_TCHAR *argv[]) { // Call down to the CONNECTOR's open() method to do the // initialization. @@ -251,13 +242,13 @@ IPC_Client<SVH, PR_CO_2>::init (int argc, ACE_TCHAR *argv[]) ACE_TEXT ("%p\n"), ACE_TEXT ("register_handler")), -1); - PR_AD remote_addr (r_addr); + typename PEER_CONNECTOR::PEER_ADDR remote_addr (r_addr); this->options_.set (ACE_Synch_Options::USE_REACTOR, timeout); - SVH *sh; + SVC_HANDLER *sh; ACE_NEW_RETURN (sh, - SVH (this->reactor ()), + SVC_HANDLER (this->reactor ()), -1); // Connect to the peer. @@ -273,15 +264,9 @@ IPC_Client<SVH, PR_CO_2>::init (int argc, ACE_TCHAR *argv[]) return 0; } -template <class SVH, PR_CO_1> -IPC_Client<SVH, PR_CO_2>::~IPC_Client (void) +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +IPC_Client<SVC_HANDLER, PEER_CONNECTOR>::~IPC_Client (void) { } -#undef PR_ST_1 -#undef PR_ST_2 -#undef PR_CO_1 -#undef PR_CO_2 -#undef PR_AD -#undef SVH #endif /* CPP_CONNECTOR_C */ diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h index 86ce63493f0..5f11cbf27e0 100644 --- a/ACE/examples/Connection/non_blocking/CPP-connector.h +++ b/ACE/examples/Connection/non_blocking/CPP-connector.h @@ -14,8 +14,8 @@ #include "ace/Svc_Handler.h" #include "ace/Sig_Adapter.h" -template <ACE_PEER_STREAM_1> -class Peer_Handler : public ACE_Svc_Handler<ACE_PEER_STREAM_2, ACE_SYNCH> +template <typename PEER_STREAM> +class Peer_Handler : public ACE_Svc_Handler<PEER_STREAM, ACE_SYNCH> { // = TITLE // Handles communication with the server. @@ -48,12 +48,12 @@ protected: int connected (void); int stdio (void); - int (Peer_Handler<ACE_PEER_STREAM_2>::*action_) (void); + int (Peer_Handler<PEER_STREAM>::*action_) (void); // Keeps track of which state we are in. }; -template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1> -class IPC_Client : public ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2> +template <typename SVC_HANDLER, typename PEER_CONNECTOR> +class IPC_Client : public ACE_Connector<SVC_HANDLER, PEER_CONNECTOR> { // = TITLE // This class illustrates how the <ACE_Connector> works. @@ -76,7 +76,7 @@ public: // Run the svc. private: - typedef ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2> + typedef ACE_Connector<SVC_HANDLER, PEER_CONNECTOR> inherited; ACE_Synch_Options options_; diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp index 2fb30695bbc..2c097321acf 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver.cpp @@ -12,7 +12,7 @@ #include "ace/Basic_Types.h" #include "ace/OS_NS_sys_select.h" #include "ace/OS_main.h" - +#include "ace/Truncate.h" // Are we running verbosely? @@ -328,7 +328,7 @@ run_event_loop (u_short port) ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT); ACE_Handle_Set temp = handle_set; - int result = ACE_OS::select (int (oneway_acceptor.get_handle ()) + 1, + int result = ACE_OS::select (ACE_Utils::truncate_cast<int> ((intptr_t)oneway_acceptor.get_handle ()) + 1, (fd_set *) temp, 0, 0, diff --git a/ACE/examples/Reactor/Misc/test_early_timeouts.cpp b/ACE/examples/Reactor/Misc/test_early_timeouts.cpp index f22ffbb70f4..6ded80b602d 100644 --- a/ACE/examples/Reactor/Misc/test_early_timeouts.cpp +++ b/ACE/examples/Reactor/Misc/test_early_timeouts.cpp @@ -21,7 +21,7 @@ #include "ace/Time_Value.h" #include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_sys_select.h" - +#include "ace/Truncate.h" int @@ -71,7 +71,7 @@ ACE_TMAIN (int, ACE_TCHAR *[]) starting_time_of_day = ACE_OS::gettimeofday (); // Wait for timeout - result = ACE_OS::select ((int) dummy_pipe.read_handle (), dummy_handle_set, 0, 0, &timeout); + result = ACE_OS::select (ACE_Utils::truncate_cast<int> ((intptr_t)dummy_pipe.read_handle ()), dummy_handle_set, 0, 0, &timeout); ACE_ASSERT (result == 0); // Note the time after select diff --git a/ACE/include/makeinclude/platform_macosx_iOS.GNU b/ACE/include/makeinclude/platform_macosx_iOS.GNU index 015b986690f..738dedfdc60 100644 --- a/ACE/include/makeinclude/platform_macosx_iOS.GNU +++ b/ACE/include/makeinclude/platform_macosx_iOS.GNU @@ -7,11 +7,11 @@ include $(ACE_ROOT)/include/makeinclude/platform_macosx_common.GNU ifneq (,$(XCODE_ROOT)) XCODE:=$(XCODE_ROOT) else - XCODE:=/Developer + XCODE:=/Applications/Xcode.app endif ifeq ($(IPHONE_TARGET), SIMULATOR) - IPHONE_PLATFORM:=$(XCODE)/Platforms/iPhoneSimulator.platform/Developer + IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneSimulator${IPHONE_VERSION}.sdk IPHONE_HARDWARE_ARCHITECTURE=i386 @@ -24,7 +24,7 @@ endif ifeq ($(IPHONE_TARGET), HARDWARE) CROSS-COMPILE=1 - IPHONE_PLATFORM:=$(XCODE)/Platforms/iPhoneOS.platform/Developer + IPHONE_PLATFORM:=$(XCODE)/Contents/Developer/Platforms/iPhoneOS.platform/Developer IPHONE_SDK:=$(IPHONE_PLATFORM)/SDKs/iPhoneOS${IPHONE_VERSION}.sdk IPHONE_HARDWARE_ARCHITECTURE=armv7 ifeq ($(iphone_codesign),1) @@ -34,8 +34,8 @@ endif rwho = 0 endif -CC:=$(IPHONE_PLATFORM)/usr/bin/clang -CXX:=$(IPHONE_PLATFORM)/usr/bin/clang++ +CC:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang +CXX:=$(XCODE)/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ AR:=$(IPHONE_PLATFORM)/usr/bin/ar RANLIB:=$(IPHONE_PLATFORM)/usr/bin/ranlib DLD = $(CXX) diff --git a/ACE/include/makeinclude/platform_mingw32.GNU b/ACE/include/makeinclude/platform_mingw32.GNU index 4e716aed034..dc1ada8ff4c 100644 --- a/ACE/include/makeinclude/platform_mingw32.GNU +++ b/ACE/include/makeinclude/platform_mingw32.GNU @@ -33,3 +33,13 @@ ifeq ($(winsock2),1) endif LIBS += -lwsock32 -lnetapi32 + +ifeq ($(GXX_4_OR_BETTER),1) + ifeq ($(CXX_MAJOR_VERSION),4) + ifeq ($(findstring $(CXX_MINOR_VERSION),7 8 9),$(CXX_MINOR_VERSION)) + CPPFLAGS += -Wno-unknown-pragmas + endif + else + CPPFLAGS += -Wno-unknown-pragmas + endif +endif diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp index a9ff3959a42..a307e6e127b 100644 --- a/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp +++ b/ACE/performance-tests/SCTP/SOCK_STREAM_srv.cpp @@ -7,6 +7,7 @@ #include "ace/Thread_Manager.h" #include "ace/Handle_Set.h" #include "ace/CDR_Stream.h" +#include "ace/Truncate.h" // FUZZ: disable check_for_streams_include #include "ace/streams.h" @@ -311,7 +312,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){ // services. So select was needed to wait on both sockets // simultaneously. In this test we could just call accept on the // one socket. - int result = ACE_OS::select((int) (acceptor_socket.get_handle()) +1, + int result = ACE_OS::select(ACE_Utils::truncate_cast<int> ((intptr_t)acceptor_socket.get_handle()) +1, (fd_set *) temp, 0, 0, diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index d1ee8a37ac6..c920af69729 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1,7 +1,7 @@ # Set the version number here. -%define ACEVER 6.1.7 -%define TAOVER 2.1.7 -%define CIAOVER 1.1.7 +%define ACEVER 6.1.8 +%define TAOVER 2.1.8 +%define CIAOVER 1.1.8 # Conditional build # Default values are diff --git a/ACE/tests/Manual_Event_Test.cpp b/ACE/tests/Manual_Event_Test.cpp index 3344ff9feb2..1539d058d60 100644 --- a/ACE/tests/Manual_Event_Test.cpp +++ b/ACE/tests/Manual_Event_Test.cpp @@ -133,7 +133,7 @@ worker (void *) if (evt.signal () == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT (" (%P|%t) %p\n"), ACE_TEXT ("signal"))); - ACE_OS::sleep (ACE_Time_Value (0, 200 * 1000 * 100)); // 200 msec + ACE_OS::sleep (ACE_Time_Value (0, 200 * 1000)); // 200 msec } if (evt.wait () == -1) diff --git a/ACE/tests/Map_Test.h b/ACE/tests/Map_Test.h index 39b4db9b682..276f5ab6325 100644 --- a/ACE/tests/Map_Test.h +++ b/ACE/tests/Map_Test.h @@ -53,7 +53,7 @@ public: size_t original_size = key.size (); // Size of this counter key. - size_t counter_key_size = sizeof this->counter_; + const size_t counter_key_size = sizeof this->counter_; // Resize to accommodate both the original data and the new key. key.size (counter_key_size + original_size); @@ -61,7 +61,7 @@ public: // Add new key data. ACE_OS::memcpy (&key[original_size], &++this->counter_, - sizeof this->counter_); + counter_key_size); // Success. return 0; diff --git a/ACE/tests/Process_Env_Test.cpp b/ACE/tests/Process_Env_Test.cpp index 116f800ad5e..185f7302adf 100644 --- a/ACE/tests/Process_Env_Test.cpp +++ b/ACE/tests/Process_Env_Test.cpp @@ -28,7 +28,8 @@ void create_large_env (setenvfn_t setenv, void *ctx) static const size_t varsize = 1200; for (int i = 0; i < 26; i++) { - char name[2] = { 'A' + i, '\0' }; + char name[2] = { 'A', '\0' }; + name[0] += i; char value[varsize]; ACE_OS::memset (value, 'R', varsize); value[varsize - 1] = '\0'; diff --git a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp index a364b027ba5..e59f43c621a 100644 --- a/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp +++ b/ACE/tests/Thread_Timer_Queue_Adapter_Test.cpp @@ -13,6 +13,7 @@ #include "ace/Timer_Wheel.h" #include "ace/Timer_Queue_Adapters.h" +#include "ace/Truncate.h" #include "test_config.h" #if defined (ACE_HAS_THREADS) @@ -143,7 +144,7 @@ class CTestEventHandler : public ICustomEventHandler /// @param p_vParameter virtual int operator() (void* p_vParameter) { - long iParameter = (long) p_vParameter; + long iParameter = ACE_Utils::truncate_cast<long> ((intptr_t)p_vParameter); ACE_DEBUG((LM_DEBUG, ACE_TEXT("%I(%t) Incrementing test event handler call count by %d.\n"), diff --git a/ACE/tests/run_test.pl b/ACE/tests/run_test.pl index 2a4b891baa7..cace3612950 100755 --- a/ACE/tests/run_test.pl +++ b/ACE/tests/run_test.pl @@ -115,6 +115,7 @@ sub run_program ($@) ## if the executable doesn't exist, the error will show ## up as part of the previous test. print "auto_run_tests: tests/$path $arguments\n"; + $ENV{COVERITY_TEST_NAME} = "tests/$path"; my ($program, $dir, $suffix) = fileparse($path); my $start_dir = getcwd (); @@ -127,7 +128,6 @@ sub run_program ($@) unlink "core"; my $P = $target->CreateProcess($program, $arguments); - if ($config_list->check_config ('Valgrind')) { $P->IgnoreExeSubDir(1); } |