diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | ace/Array_Base.h | 4 | ||||
| -rw-r--r-- | ace/Containers_T.h | 8 | ||||
| -rw-r--r-- | ace/NT_Service.cpp | 7 | ||||
| -rw-r--r-- | ace/String_Base.h | 16 | ||||
| -rw-r--r-- | examples/Threads/auto_event.cpp | 2 |
6 files changed, 38 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog index c9ee4379fd2..539dd09cb7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +Fri May 30 14:46:00 2003 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * examples/Threads/auto_event.cpp (writer): Replaced "wait" with "signal" + in a comment (this was a copy and past error!). Thanks to Kobi for + reporting this. + + * ace/Containers_T.h (class ACE_Ordered_MultiSet): + * ace/String_Base.h (ACE_String_Base): + * ace/Array_Base.h: Changed all uses of "ACE_Allocator *allocator" to + "ACE_Allocator *the_allocator" to prevent problems when ACE is + used with some versions of STL. Thanks to Kobi Arazi + <kcarazi@finjan.com> for reporting this. + + * ace/NT_Service.cpp: Fixed some problems so that the + ACE_NT_Service::insert() methods will self-register correctly if + the service executable is located on a path with spaces. Thanks + to Theo Landman <tlandman@justcroft.com> for reporting this. + Fri May 30 13:52:49 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * Makefile: Added a new target 'releaseciao' to include CIAO in diff --git a/ace/Array_Base.h b/ace/Array_Base.h index 5da6ea346ae..ea636ec440f 100644 --- a/ace/Array_Base.h +++ b/ace/Array_Base.h @@ -50,12 +50,12 @@ public: /// Dynamically create an uninitialized array. ACE_Array_Base (size_t size = 0, - ACE_Allocator *alloc = 0); + ACE_Allocator *the_allocator = 0); /// Dynamically initialize the entire array to the <default_value>. ACE_Array_Base (size_t size, const T &default_value, - ACE_Allocator *alloc = 0); + ACE_Allocator *the_allocator = 0); /** * The copy constructor performs initialization by making an exact diff --git a/ace/Containers_T.h b/ace/Containers_T.h index 1cd1e016d92..19c5abc6a9a 100644 --- a/ace/Containers_T.h +++ b/ace/Containers_T.h @@ -386,7 +386,7 @@ public: * Initialize an empty stack using the user specified allocation strategy * if provided. */ - ACE_Unbounded_Stack (ACE_Allocator *alloc = 0); + ACE_Unbounded_Stack (ACE_Allocator *the_allocator = 0); /// The copy constructor (performs initialization). /** @@ -837,7 +837,7 @@ public: * Initialize an empy list using the allocation strategy specified by the user. * If none is specified, then use default allocation strategy. */ - ACE_Double_Linked_List (ACE_Allocator *alloc = 0); + ACE_Double_Linked_List (ACE_Allocator *the_allocator = 0); /// Copy constructor. /** @@ -1065,7 +1065,7 @@ public: // = Initialization and termination methods. /// Delegates to ACE_Double_Linked_List. - ACE_DLList (ACE_Allocator *alloc = 0); + ACE_DLList (ACE_Allocator *the_allocator = 0); /// Delegates to ACE_Double_Linked_List. ACE_DLList (const ACE_DLList<T> &l); @@ -1753,7 +1753,7 @@ public: * Initialize the set using the allocation strategy specified. If none, use the * default strategy. */ - ACE_Ordered_MultiSet (ACE_Allocator *alloc = 0); + ACE_Ordered_MultiSet (ACE_Allocator *the_allocator = 0); /// Copy constructor. /** diff --git a/ace/NT_Service.cpp b/ace/NT_Service.cpp index 1562ed4c9f0..e11882f4c31 100644 --- a/ace/NT_Service.cpp +++ b/ace/NT_Service.cpp @@ -183,15 +183,18 @@ ACE_NT_Service::insert (DWORD start_type, const ACE_TCHAR *account_name, const ACE_TCHAR *password) { - ACE_TCHAR this_exe[MAXPATHLEN]; + ACE_TCHAR this_exe[MAXPATHLEN + 2]; // Insure ACE_OS::last_error finds GetLastError unless we set errno. errno = 0; if (exe_path == 0) { - if (ACE_TEXT_GetModuleFileName (0, this_exe, sizeof this_exe) == 0) + if (ACE_TEXT_GetModuleFileName (0, this_exe + 1, MAXPATHLEN) == 0) return -1; + // Make sure that this_exe is quoted + this_exe[0] = ACE_TEXT ('\"'); + ACE_OS::strcat (this_exe, ACE_TEXT ("\""); exe_path = this_exe; } diff --git a/ace/String_Base.h b/ace/String_Base.h index 8856be1dba0..65adcd15241 100644 --- a/ace/String_Base.h +++ b/ace/String_Base.h @@ -57,7 +57,7 @@ public: * @param alloc ACE_Allocator associated with string * @return Default ACE_String_Base string. */ - ACE_String_Base (ACE_Allocator * alloc = 0); + ACE_String_Base (ACE_Allocator *the_allocator = 0); /** * Constructor that copies @a s into dynamically allocated memory. @@ -71,8 +71,8 @@ public: * freeing memory. * @return ACE_String_Base containing const CHAR *s */ - ACE_String_Base (const CHAR * s, - ACE_Allocator * alloc = 0, + ACE_String_Base (const CHAR *s, + ACE_Allocator *the_allocator = 0, int release = 1); /** @@ -88,9 +88,9 @@ public: * freeing memory. * @return ACE_String_Base containing const CHAR *s */ - ACE_String_Base (const CHAR * s, + ACE_String_Base (const CHAR *s, size_t len, - ACE_Allocator * alloc = 0, + ACE_Allocator *the_allocator = 0, int release = 1); /** @@ -109,7 +109,7 @@ public: * @return ACE_String_Base containing CHAR 'c' */ ACE_String_Base (CHAR c, - ACE_Allocator * alloc = 0); + ACE_Allocator *the_allocator = 0); /** * Constructor that dynamically allocate @a len long of char array @@ -122,7 +122,7 @@ public: */ ACE_String_Base (size_t len, CHAR c = 0, - ACE_Allocator * alloc = 0); + ACE_Allocator *the_allocator = 0); /** * Deletes the memory... @@ -381,7 +381,7 @@ protected: /** * Pointer to a memory allocator. */ - ACE_Allocator * allocator_; + ACE_Allocator *allocator_; /** * Length of the ACE_String_Base data (not counting the trailing '\0'). diff --git a/examples/Threads/auto_event.cpp b/examples/Threads/auto_event.cpp index 52e13d68ea4..4c7ebcb2392 100644 --- a/examples/Threads/auto_event.cpp +++ b/examples/Threads/auto_event.cpp @@ -66,7 +66,7 @@ writer (void *arg) if (EVENT::instance ()->signal () == -1) { - ACE_ERROR ((LM_ERROR, "thread wait failed")); + ACE_ERROR ((LM_ERROR, "thread signal failed")); ACE_OS::exit (0); } |