diff options
| -rw-r--r-- | ChangeLog | 52 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 52 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 52 | ||||
| -rw-r--r-- | THANKS | 6 | ||||
| -rw-r--r-- | ace/ACE.cpp | 4 | ||||
| -rw-r--r-- | ace/Configuration_Import_Export.cpp | 2 | ||||
| -rw-r--r-- | ace/Naming_Context.cpp | 1 | ||||
| -rw-r--r-- | ace/Naming_Context.h | 1 | ||||
| -rw-r--r-- | ace/OS.i | 7 | ||||
| -rw-r--r-- | ace/RB_Tree.cpp | 33 | ||||
| -rw-r--r-- | ace/Synch.i | 22 | ||||
| -rw-r--r-- | ace/TP_Reactor.cpp | 3 | ||||
| -rw-r--r-- | ace/config-macosx.h | 2 | ||||
| -rw-r--r-- | ace/config-win32.h | 6 | ||||
| -rw-r--r-- | include/makeinclude/platform_macosx.GNU | 12 |
15 files changed, 192 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog index bd65c8e94a1..f19b6a4b2f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,6 @@ Thu Nov 1 15:49:04 Balachandran Natarajan <bala@cs.wustl.edu> TAO applications on this platform and compiler combinations. Thanks to Don Hinton <dhinton@gmx.net> for reporting the problem. - Thu Nov 1 14:25:52 2001 Jeff Parsons <parsons@cs.wustl.edu> @@ -36,13 +35,54 @@ Thu Nov 1 10:27:21 2001 Ossama Othman <ossama@uci.edu> the Reactor's handler repository. Direct indexing is used for efficiency reasons. -Wed Oct 31 16:45:07 2001 Ossama Othman <ossama@uci.edu> +Thu Nov 1 06:38:30 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/ACE.cpp: Fixed some minor formatting problems so that + format_hexdump() works properly. Thanks to Kyle Brost + <Kyle.Brost@quest.com> for reporting this. + + * ace/config-win32.h: Include the config-cygwin32.h file when + __CYGWIN32__ is enabled. Thanks to Johnny Willemsen for + reporting this. + + * ace/Synch.i (remove): Added some casts to make certain compilers + happy? Thanks to Guillaume Renaud <guillaume.renaud@valtech.fr> + for reporting this. + + * ace/OS.i: Updated the Win32 version of ACE_OS::llseek(). Thanks to + Doron Rajwan <doron@BANDWIZ.COM> for reporting this. + +Wed Oct 31 11:25:40 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/OS.h: The ACE_OS::llseek() method must be static! Thanks to + Doron Rajwan <doron@BANDWIZ.COM> for reporting this. + +Tue Oct 30 08:30:16 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/RB_Tree.cpp (operator=): Make sure to check for self-assignment + in the operator=. Thanks to Johnny Willemsen for reporting + this. + +Mon Oct 29 05:23:56 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Naming_Context.{h,cpp}: Moved ACE_STATIC_SVC_REQUIRE from the + .h file to the .cpp file to avoid multiple definitions. Thanks to + Boris Kaminer <boris.kaminer@orcsoftware.com> for reporting this. + +Sun Oct 28 10:05:32 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/config-macosx.h: + * include/makeincludes/platform_macosx.GNU + Added new fixes to get this to work on MacOS X. Thanks to John + Michael Zorko <j.zorko@att.net> and Fikri Pribadi + <fikri@ugotacall.com> for contributing this. - * ace/OS.h (llseek): +Wed Oct 24 23:59:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - Made ACE_OS::llseek() a static method, as it was originally - intended to be. Thanks to Doron Rajwan <doron@BANDWIZ.COM> for - pointing out the problem. + * ace/Configuration_Import_Export.cpp: Fixed a bug where a + check of a pointer was made rather than the character pointed to + by the pointer. Thanks to Juan Jose Comellas + <uanjo@comellas.org> for reporting this. Tue Oct 30 22:53:57 2001 Ossama Othman <ossama@uci.edu> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index bd65c8e94a1..f19b6a4b2f0 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -11,7 +11,6 @@ Thu Nov 1 15:49:04 Balachandran Natarajan <bala@cs.wustl.edu> TAO applications on this platform and compiler combinations. Thanks to Don Hinton <dhinton@gmx.net> for reporting the problem. - Thu Nov 1 14:25:52 2001 Jeff Parsons <parsons@cs.wustl.edu> @@ -36,13 +35,54 @@ Thu Nov 1 10:27:21 2001 Ossama Othman <ossama@uci.edu> the Reactor's handler repository. Direct indexing is used for efficiency reasons. -Wed Oct 31 16:45:07 2001 Ossama Othman <ossama@uci.edu> +Thu Nov 1 06:38:30 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/ACE.cpp: Fixed some minor formatting problems so that + format_hexdump() works properly. Thanks to Kyle Brost + <Kyle.Brost@quest.com> for reporting this. + + * ace/config-win32.h: Include the config-cygwin32.h file when + __CYGWIN32__ is enabled. Thanks to Johnny Willemsen for + reporting this. + + * ace/Synch.i (remove): Added some casts to make certain compilers + happy? Thanks to Guillaume Renaud <guillaume.renaud@valtech.fr> + for reporting this. + + * ace/OS.i: Updated the Win32 version of ACE_OS::llseek(). Thanks to + Doron Rajwan <doron@BANDWIZ.COM> for reporting this. + +Wed Oct 31 11:25:40 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/OS.h: The ACE_OS::llseek() method must be static! Thanks to + Doron Rajwan <doron@BANDWIZ.COM> for reporting this. + +Tue Oct 30 08:30:16 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/RB_Tree.cpp (operator=): Make sure to check for self-assignment + in the operator=. Thanks to Johnny Willemsen for reporting + this. + +Mon Oct 29 05:23:56 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Naming_Context.{h,cpp}: Moved ACE_STATIC_SVC_REQUIRE from the + .h file to the .cpp file to avoid multiple definitions. Thanks to + Boris Kaminer <boris.kaminer@orcsoftware.com> for reporting this. + +Sun Oct 28 10:05:32 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/config-macosx.h: + * include/makeincludes/platform_macosx.GNU + Added new fixes to get this to work on MacOS X. Thanks to John + Michael Zorko <j.zorko@att.net> and Fikri Pribadi + <fikri@ugotacall.com> for contributing this. - * ace/OS.h (llseek): +Wed Oct 24 23:59:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - Made ACE_OS::llseek() a static method, as it was originally - intended to be. Thanks to Doron Rajwan <doron@BANDWIZ.COM> for - pointing out the problem. + * ace/Configuration_Import_Export.cpp: Fixed a bug where a + check of a pointer was made rather than the character pointed to + by the pointer. Thanks to Juan Jose Comellas + <uanjo@comellas.org> for reporting this. Tue Oct 30 22:53:57 2001 Ossama Othman <ossama@uci.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index bd65c8e94a1..f19b6a4b2f0 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -11,7 +11,6 @@ Thu Nov 1 15:49:04 Balachandran Natarajan <bala@cs.wustl.edu> TAO applications on this platform and compiler combinations. Thanks to Don Hinton <dhinton@gmx.net> for reporting the problem. - Thu Nov 1 14:25:52 2001 Jeff Parsons <parsons@cs.wustl.edu> @@ -36,13 +35,54 @@ Thu Nov 1 10:27:21 2001 Ossama Othman <ossama@uci.edu> the Reactor's handler repository. Direct indexing is used for efficiency reasons. -Wed Oct 31 16:45:07 2001 Ossama Othman <ossama@uci.edu> +Thu Nov 1 06:38:30 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/ACE.cpp: Fixed some minor formatting problems so that + format_hexdump() works properly. Thanks to Kyle Brost + <Kyle.Brost@quest.com> for reporting this. + + * ace/config-win32.h: Include the config-cygwin32.h file when + __CYGWIN32__ is enabled. Thanks to Johnny Willemsen for + reporting this. + + * ace/Synch.i (remove): Added some casts to make certain compilers + happy? Thanks to Guillaume Renaud <guillaume.renaud@valtech.fr> + for reporting this. + + * ace/OS.i: Updated the Win32 version of ACE_OS::llseek(). Thanks to + Doron Rajwan <doron@BANDWIZ.COM> for reporting this. + +Wed Oct 31 11:25:40 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/OS.h: The ACE_OS::llseek() method must be static! Thanks to + Doron Rajwan <doron@BANDWIZ.COM> for reporting this. + +Tue Oct 30 08:30:16 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/RB_Tree.cpp (operator=): Make sure to check for self-assignment + in the operator=. Thanks to Johnny Willemsen for reporting + this. + +Mon Oct 29 05:23:56 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/Naming_Context.{h,cpp}: Moved ACE_STATIC_SVC_REQUIRE from the + .h file to the .cpp file to avoid multiple definitions. Thanks to + Boris Kaminer <boris.kaminer@orcsoftware.com> for reporting this. + +Sun Oct 28 10:05:32 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * ace/config-macosx.h: + * include/makeincludes/platform_macosx.GNU + Added new fixes to get this to work on MacOS X. Thanks to John + Michael Zorko <j.zorko@att.net> and Fikri Pribadi + <fikri@ugotacall.com> for contributing this. - * ace/OS.h (llseek): +Wed Oct 24 23:59:13 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - Made ACE_OS::llseek() a static method, as it was originally - intended to be. Thanks to Doron Rajwan <doron@BANDWIZ.COM> for - pointing out the problem. + * ace/Configuration_Import_Export.cpp: Fixed a bug where a + check of a pointer was made rather than the character pointed to + by the pointer. Thanks to Juan Jose Comellas + <uanjo@comellas.org> for reporting this. Tue Oct 30 22:53:57 2001 Ossama Othman <ossama@uci.edu> @@ -566,7 +566,7 @@ N Becker <nbecker@fred.net> Yaolong Lan <lyaolong@cs.sunysb.edu> Elias Sreih <sealstd1@nortelnetworks.com> Liang Chen <chenl@nortelnetworks.com> -Mark Laffoon <mark.laffoon@centraxcorp.com> +Mark Laffoon <mark.laffoon@burning-glass.com> Ti Z <tiz@cisco.com> Brian Dance <Brian_Dance@UECCS.co.uk> Alexey Gadzhiev <alg@null.ru> @@ -1353,8 +1353,12 @@ Tad Hetke <thetke@oresis.com> Graeme Clark <gclark@opentext.com> Gu Song <gusong_m@yahoo.com> Chris Hughes <chughes@stentor.com> +Fikri Pribadi <fikri@ugotacall.com> Ioulia Passynkova <ioulia.passynkova@nettest.com> +Steve Osselton <steve@prismtechnologies.com> +Doron Rajwan <doron@BANDWIZ.COM> Stuart Jones <sjones@clcsmail.ksc.nasa.gov> +Guillaume Renaud <guillaume.renaud@valtech.fr> 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/ACE.cpp b/ace/ACE.cpp index 45514732050..e0c019e171a 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -2505,7 +2505,7 @@ ACE::format_hexdump (const char *buffer, if (i == 7) { ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" \n")); + ACE_LIB_TEXT (" ")); obuf++; } textver[i] = ACE_OS::ace_isprint (c) ? c : '.'; @@ -2514,7 +2514,7 @@ ACE::format_hexdump (const char *buffer, for (i = size % 16; i < 16; i++) { ACE_OS::sprintf (obuf, - ACE_LIB_TEXT (" ")); + ACE_LIB_TEXT (" ")); obuf += 3; textver[i] = ' '; } diff --git a/ace/Configuration_Import_Export.cpp b/ace/Configuration_Import_Export.cpp index ddbd41614de..b6db4cb8e75 100644 --- a/ace/Configuration_Import_Export.cpp +++ b/ace/Configuration_Import_Export.cpp @@ -377,7 +377,7 @@ ACE_Ini_ImpExp::import_config (const ACE_TCHAR* fileName) // we have a line const ACE_TCHAR *name = this->skip_whitespace (buffer); - if (name) + if (*name != '\0') { ACE_TCHAR *end = (ACE_TCHAR *) ACE_OS::strpbrk (name, ACE_LIB_TEXT ("= \t\n\r")); diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp index ece25f68fe0..2eb10e6dd3e 100644 --- a/ace/Naming_Context.cpp +++ b/ace/Naming_Context.cpp @@ -27,6 +27,7 @@ ACE_STATIC_SVC_DEFINE (ACE_Naming_Context, ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ, 0) +ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context) // The ACE_Naming_Context static service object is now defined // by the ACE_Object_Manager, in Object_Manager.cpp. diff --git a/ace/Naming_Context.h b/ace/Naming_Context.h index 4ffc94901c8..3fdf9d8f6a4 100644 --- a/ace/Naming_Context.h +++ b/ace/Naming_Context.h @@ -359,7 +359,6 @@ private: ACE_FACTORY_DECLARE (ACE, ACE_Naming_Context) ACE_STATIC_SVC_DECLARE_EXPORT (ACE,ACE_Naming_Context) -ACE_STATIC_SVC_REQUIRE (ACE_Naming_Context) #include "ace/post.h" #endif /* ACE_NAMING_CONTEXT_H */ @@ -11072,7 +11072,12 @@ ACE_OS::llseek (ACE_HANDLE handle, ACE_LOFF_T offset, int whence) ACE_OSCALL_RETURN (::lseek64 (handle, offset, whence), ACE_LOFF_T, -1); #elif defined (ACE_HAS_LLSEEK) # if defined (ACE_WIN32) - ACE_OSCALL_RETURN (::_lseeki64 (int (handle), offset, whence), ACE_LOFF_T, -1); + LARGE_INTEGER li; + li.QuadPart = offset; + li.LowPart = ::SetFilePointer (handle, li.LowPart, &li.HighPart, whence); + if (li.LowPart == 0xFFFFFFFF && GetLastError() != NO_ERROR) + li.QuadPart = -1; + return li.QuadPart; # else ACE_OSCALL_RETURN (::llseek (handle, offset, whence), ACE_LOFF_T, -1); # endif /* WIN32 */ diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp index df3fa3836ea..7dad2b1f759 100644 --- a/ace/RB_Tree.cpp +++ b/ace/RB_Tree.cpp @@ -104,22 +104,24 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator = (const ACE_RB_Tr ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator ="); ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_); - // Clear out the existing tree. - close_i (); + if (this != &rbt) + { + // Clear out the existing tree. + close_i (); - // Make a deep copy of the passed tree. - ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt); + // Make a deep copy of the passed tree. + ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt); - for (iter.first (); - iter.is_done () == 0; - iter.next ()) - insert_i (*(iter.key ()), - *(iter.item ())); + for (iter.first (); + iter.is_done () == 0; + iter.next ()) + insert_i (*(iter.key ()), + *(iter.item ())); - // Use the same allocator as the rhs. - allocator_ = rbt.allocator_; + // Use the same allocator as the rhs. + allocator_ = rbt.allocator_; + } } - // Less than comparison function for keys, default functor // implementation returns 1 if k1 < k2, 0 otherwise. @@ -1013,8 +1015,11 @@ template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator= (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter) { ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator="); - tree_ = iter.tree_; - node_ = iter.node_; + if (this != &iter) + { + tree_ = iter.tree_; + node_ = iter.node_; + } } // Destructor. diff --git a/ace/Synch.i b/ace/Synch.i index 4d6550a6e8d..4bb95145df5 100644 --- a/ace/Synch.i +++ b/ace/Synch.i @@ -204,14 +204,14 @@ ACE_INLINE int ACE_Mutex::remove (void) { // ACE_TRACE ("ACE_Mutex::remove"); -#if defined(CHORUS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) +#if defined (CHORUS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_STHREADS) int result = 0; - // In the case of a interprocess mutex, the owner is the first process - // that created the shared memory object. In this case, the lockname_ - // pointer will be non-zero (points to allocated memory for the name). - // Owner or not, the memory needs to be unmapped from the process. - // If we are the owner, the file used for shm_open needs to be deleted - // as well. + // In the case of a interprocess mutex, the owner is the first + // process that created the shared memory object. In this case, the + // lockname_ pointer will be non-zero (points to allocated memory + // for the name). Owner or not, the memory needs to be unmapped + // from the process. If we are the owner, the file used for + // shm_open needs to be deleted as well. if (this->process_lock_) { if (this->removed_ == 0) @@ -221,14 +221,12 @@ ACE_Mutex::remove (void) // Only destroy the lock if we're the ones who initialized // it. if (!this->lockname_) - { - ACE_OS::munmap (this->process_lock_, - sizeof (ACE_mutex_t)); - } + ACE_OS::munmap ((void *) this->process_lock_, + sizeof (ACE_mutex_t)); else { result = ACE_OS::mutex_destroy (this->process_lock_); - ACE_OS::munmap (this->process_lock_, + ACE_OS::munmap ((void *) this->process_lock_, sizeof (ACE_mutex_t)); ACE_OS::shm_unlink (this->lockname_); ACE_OS::free (ACE_static_cast (void *, diff --git a/ace/TP_Reactor.cpp b/ace/TP_Reactor.cpp index 189ee57d357..e6b0d189f89 100644 --- a/ace/TP_Reactor.cpp +++ b/ace/TP_Reactor.cpp @@ -125,7 +125,6 @@ ACE_TP_Reactor::owner (ACE_thread_t, ACE_thread_t *o_id) *o_id = ACE_Thread::self (); return 0; - } int @@ -135,10 +134,8 @@ ACE_TP_Reactor::owner (ACE_thread_t *t_id) *t_id = ACE_Thread::self (); return 0; - } - int ACE_TP_Reactor::handle_events (ACE_Time_Value *max_wait_time) { diff --git a/ace/config-macosx.h b/ace/config-macosx.h index 63f3ca42307..71b5d09a49b 100644 --- a/ace/config-macosx.h +++ b/ace/config-macosx.h @@ -14,7 +14,7 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -//#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION +#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION #if defined (ACE_HAS_PENTIUM) # undef ACE_HAS_PENTIUM diff --git a/ace/config-win32.h b/ace/config-win32.h index 37150b77302..f193d5078bd 100644 --- a/ace/config-win32.h +++ b/ace/config-win32.h @@ -19,13 +19,9 @@ #define ACE_CONFIG_WIN32_H #include "ace/pre.h" - - // NOTE: Please do not add anything besides #include's here. Put other stuff // (definitions, etc.) in the included headers - - // Include the platform specific config file (Windows CE is special) #if defined (_WIN32_WCE) @@ -52,6 +48,8 @@ # include "ace/config-win32-ghs.h" #elif defined (__MINGW32__) # include "ace/config-win32-mingw.h" +#elif defined (__CYGWIN32__) +# include "ace/config-cygwin32.h" #else # error Compiler is not supported #endif diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU index 98f35beb2b0..c9b9037a175 100644 --- a/include/makeinclude/platform_macosx.GNU +++ b/include/makeinclude/platform_macosx.GNU @@ -1,15 +1,16 @@ -# $Id$ +# platform_macosx.GNU,v 4.6 2001/08/14 18:57:28 bala Exp # platform_macosx.GNU # preliminary support for Mac OS X DP4, some stuff still doesn't work. CC = cc -CXX = c++ -CFLAGS += -Wall -Wpointer-arith -pipe -CCFLAGS += $(CFLAGS) -fimplicit-templates -fcheck-new +CXX = c++ +CFLAGS += -Wall -Wpointer-arith -pipe +CCFLAGS += $(CFLAGS) -fimplicit-templates -fcheck-new DCFLAGS += -g DLD = libtool LD = $(CXX) -LDFLAGS += +LDFLAGS += -flat_namespace +LDONLYFLAGS += -flat-namespace LIBS += -lcc_dynamic -lstdc++ -lpcap OCFLAGS += -O3 RANLIB = ranlib @@ -17,3 +18,4 @@ SOEXT = dylib SOFLAGS = -dynamic SOBUILD = -o $(VSHDIR)$*.dylib $< + |