diff options
| -rw-r--r-- | ChangeLog-96b | 17 | ||||
| -rw-r--r-- | netsvcs/lib/Name_Handler.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/lib/Server_Logging_Handler.cpp | 2 | ||||
| -rw-r--r-- | netsvcs/lib/Token_Handler.cpp | 2 | ||||
| -rw-r--r-- | tests/Naming_Test.cpp | 2 |
5 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog-96b b/ChangeLog-96b index 20742903f5c..5d241818f3e 100644 --- a/ChangeLog-96b +++ b/ChangeLog-96b @@ -1,9 +1,16 @@ -Sun Dec 1 19:19:02 1996 Douglas C. Schmidt <schmidt@lambada.cs.wustl.edu> +Mon Dec 2 00:23:23 1996 Irfan Pyarali <irfan@flamenco.cs.wustl.edu> - * ace/ReactorEx: Added a new parameter to the Reactor's - initialization methods so that we can install a subclass of - ACE_Timer_Queue. This is in anticipation of Tim's new - "real-time" implementation of a timer queue. + * test/Naming_Test: Changed test to use "lite" implementation to + speed things up. + + * netsvcs/lib: Fixed multiple type mismatch warnings. + + * ace/ReactorEx: Fixed syntax errors in recently modified + ReactorEx.* files + + * ace/ace.{mdp.mak}: Added Strategies.cpp to VC++ makefile. + +Sun Dec 1 19:19:02 1996 Douglas C. Schmidt <schmidt@lambada.cs.wustl.edu> * ace/Reactor: Added a new parameter to the Reactor's initialization methods so that we can install a subclass of diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp index 09daccbbc7e..f2ddb2e950f 100644 --- a/netsvcs/lib/Name_Handler.cpp +++ b/netsvcs/lib/Name_Handler.cpp @@ -458,7 +458,7 @@ ACE_Name_Handler::recv_request (void) length - sizeof (ACE_UINT32)); // Subtract off the size of the part we skipped over... - if (n != (length - sizeof (ACE_UINT32))) + if (n != (length - (ssize_t) sizeof (ACE_UINT32))) { ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n", "invalid length", length, n)); diff --git a/netsvcs/lib/Server_Logging_Handler.cpp b/netsvcs/lib/Server_Logging_Handler.cpp index 7ecefede79b..46a4a3762b8 100644 --- a/netsvcs/lib/Server_Logging_Handler.cpp +++ b/netsvcs/lib/Server_Logging_Handler.cpp @@ -163,7 +163,7 @@ ACE_Server_Logging_Handler<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2>::ACE_Server_ template <ACE_PEER_STREAM_1, class COUNTER, ACE_SYNCH_1> int ACE_Server_Logging_Handler<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_2>::handle_logging_record (void) { - size_t len; + ssize_t len; // Lock used to serialize access to std output // (this should be in the class, but the SunC++ compiler is broken...) static ACE_SYNCH_MUTEX lock; diff --git a/netsvcs/lib/Token_Handler.cpp b/netsvcs/lib/Token_Handler.cpp index 45cb9a22c04..9fedf86b066 100644 --- a/netsvcs/lib/Token_Handler.cpp +++ b/netsvcs/lib/Token_Handler.cpp @@ -658,7 +658,7 @@ ACE_Token_Handler::recv_request (void) length - sizeof (ACE_UINT32)); // Subtract off the size of the part we skipped over... - if (n != (length - sizeof (ACE_UINT32))) + if (n != (length - (ssize_t) sizeof (ACE_UINT32))) { ACE_ERROR ((LM_ERROR, "%p expected %d, got %d\n", "invalid length", length, n)); diff --git a/tests/Naming_Test.cpp b/tests/Naming_Test.cpp index faeb86ecc21..712ff5fd2a2 100644 --- a/tests/Naming_Test.cpp +++ b/tests/Naming_Test.cpp @@ -135,7 +135,7 @@ main (int argc, char *argv[]) // Set the database name using mktemp to generate a unique file name name_options->database (ACE_OS::mktemp (temp_file)); - ACE_ASSERT (ns_context->open (ACE_Naming_Context::PROC_LOCAL) != -1); + ACE_ASSERT (ns_context->open (ACE_Naming_Context::PROC_LOCAL, 1) != -1); // Add some bindings to the database bind (ns_context, 0); |