diff options
| -rw-r--r-- | ChangeLog-97b | 41 | ||||
| -rw-r--r-- | README | 1 | ||||
| -rw-r--r-- | ace/Log_Msg.cpp | 2 | ||||
| -rw-r--r-- | ace/SV_Semaphore_Simple.h | 2 | ||||
| -rw-r--r-- | tests/Makefile | 1 |
5 files changed, 39 insertions, 8 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index a51de61efda..a5e8dfaf40e 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,11 +1,33 @@ -Wed Sep 17 15:17:38 1997 James C Hu <jxh@lambada.cs.wustl.edu> +Wed Sep 17 17:25:32 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu> - * ace/Filecache.cpp: ACE_Filecache::finish should check to see if - the file passed in is NULL before attempting to grab the - associated hash lock. Reported by Samuel Melamed - <sam@vdo.net>. + * ace/Log_Msg.cpp (open): In the UNICODE version the compiler + complains about mixed wchar/char usage in Log_Msg.cpp: + + Log_Msg.cpp(468) : error C2665: 'ACE_INET_Addr::ACE_INET_Addr' : + none of the 8 overloads can convert parameter 1 + from type 'const unsigned short *' + + I fixed it modifing the connect() call from + + status = con.connect (*ACE_Log_Msg_message_queue, + ACE_INET_Addr (logger_key)); + + to + + status = con.connect (*ACE_Log_Msg_message_queue, + ACE_INET_Addr + (ACE_MULTIBYTE_STRING(logger_key))); -Wed Sep 17 13:40:16 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + Thanks to Dieter Quehl <dietrich.quehl@med.siemens.de> for + reporting this. + + * ace/SV_Semaphore_Simple.h: By default, we want the flags to + perform a SEM_UNDO. Thanks to Sandro Doro + <doros@aureus.sublink.org> for reporting this. + + * tests/Makefile (BIN): Added Semaphore_Test.cpp to the Makefile. + Thanks to Sandro Doro <doros@aureus.sublink.org> for reporting + this. * tests/Async_Timer_Queue_Test.cpp: If you want to print a '\', you need to make it a \\... Thanks to David for noticing this. @@ -25,6 +47,13 @@ Wed Sep 17 13:40:16 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> framing mechanisms used throughout ACE in various configurations. +Wed Sep 17 15:17:38 1997 James C Hu <jxh@lambada.cs.wustl.edu> + + * ace/Filecache.cpp: ACE_Filecache::finish should check to see if + the file passed in is NULL before attempting to grab the + associated hash lock. Reported by Samuel Melamed + <sam@vdo.net>. + Wed Sep 17 13:51:25 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> * bin/auto_compile: @@ -443,6 +443,7 @@ Bob Laferriere <laferrie@gsao.med.ge.com> Satheesh Kumar MG <satheesh@india.aspectdv.com> Karen Amestoy <kamestoy@CCGATE.HAC.COM> Jeff Richard <jrichard@OhioEE.com> +Samuel Melamed <sam@vdo.net> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson and is now at ObjectSpace. Paul devised the recursive diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp index ea8b4f178e9..dbe7dbb86d1 100644 --- a/ace/Log_Msg.cpp +++ b/ace/Log_Msg.cpp @@ -465,7 +465,7 @@ ACE_Log_Msg::open (const char *prog_name, ACE_Log_Msg_message_queue->close (); ACE_SOCK_Connector con; status = con.connect (*ACE_Log_Msg_message_queue, - ACE_INET_Addr (logger_key)); + ACE_INET_Addr (ACE_MULTIBYTE_STRING (logger_key))); } #else if (ACE_Log_Msg_message_queue->get_handle () != ACE_INVALID_HANDLE) diff --git a/ace/SV_Semaphore_Simple.h b/ace/SV_Semaphore_Simple.h index 3ad7410df41..a3da30f65e1 100644 --- a/ace/SV_Semaphore_Simple.h +++ b/ace/SV_Semaphore_Simple.h @@ -97,7 +97,7 @@ public: // Tannenbaums UP operation. // = Semaphore operation methods. - int op (int val, u_short semnum = 0, int flags = 0) const; + int op (int val, u_short semnum = 0, int flags = SEM_UNDO) const; // General ACE_SV_Semaphore operation. Increment or decrement by a // specific amount (positive or negative; amount can`t be zero). diff --git a/tests/Makefile b/tests/Makefile index 7bbb09168f1..6edad16110c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -38,6 +38,7 @@ BIN = Async_Timer_Queue_Test \ Reactor_Timer_Test \ Reader_Writer_Test \ Recursive_Mutex_Test \ + Semaphore_Test \ Service_Config_Test \ Sigset_Ops_Test \ SOCK_Test \ |