diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 5 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 5 | ||||
-rw-r--r-- | THANKS | 1 | ||||
-rw-r--r-- | ace/SOCK_Dgram_Mcast_T.h | 2 | ||||
-rw-r--r-- | examples/C++NPv2/README | 52 | ||||
-rw-r--r-- | tests/OS_Test.cpp | 1 |
7 files changed, 62 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index eadf337e312..f4ce9c021c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 20 13:37:55 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * examples/C++NPv2/README: Updated the README file to map the filenames + to the chapters in C++NPv2. + Wed Jun 19 21:30:05 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> Bill Fulton <Bill_A_Fulton@raytheon.com> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index eadf337e312..f4ce9c021c8 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Thu Jun 20 13:37:55 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * examples/C++NPv2/README: Updated the README file to map the filenames + to the chapters in C++NPv2. + Wed Jun 19 21:30:05 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> Bill Fulton <Bill_A_Fulton@raytheon.com> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index eadf337e312..f4ce9c021c8 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Thu Jun 20 13:37:55 2002 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> + + * examples/C++NPv2/README: Updated the README file to map the filenames + to the chapters in C++NPv2. + Wed Jun 19 21:30:05 UTC 2002 Craig Rodrigues <crodrigu@bbn.com> Bill Fulton <Bill_A_Fulton@raytheon.com> @@ -1535,6 +1535,7 @@ Wanjia <jiawan@huawei.com> Shanliang Cheng <shanliang@huawei.com> Andy Ling <Andy.Ling@Quantel.Com> Stephen Howard <stephen.e.howard@lmco.com> +Carsten T. Nielsen <ctn@maerskdatadefence.dk> 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/SOCK_Dgram_Mcast_T.h b/ace/SOCK_Dgram_Mcast_T.h index ed6784ee77e..bc0f2f3e6c6 100644 --- a/ace/SOCK_Dgram_Mcast_T.h +++ b/ace/SOCK_Dgram_Mcast_T.h @@ -435,7 +435,7 @@ private: /// Network interface to which all <send> methods send multicast datagrams. ACE_TCHAR *send_net_if_; - typedef ACE_DLList<ip_mreq> subscription_list_t; + typedef ACE_DLList<ip_mreq> subscription_list_t; typedef ACE_DLList_Iterator<ip_mreq> subscription_list_iter_t; /// List of currently subscribed addr/iface pairs (and assc. types). ACE_MUTABLE subscription_list_t subscription_list_; diff --git a/examples/C++NPv2/README b/examples/C++NPv2/README index c77bc6d447a..d23600083b0 100644 --- a/examples/C++NPv2/README +++ b/examples/C++NPv2/README @@ -21,13 +21,51 @@ Mapping Source Files to Book Chapters The files in this directory map to the chapters in C++NPv2 as follows: -Chapter 3 -Chapter 4 -Chapter 5 -Chapter 6 -Chapter 7 -Chapter 8 -Chapter 9 +Chapter 3 Logging_Acceptor.cpp + Logging_Acceptor.h + Logging_Acceptor_Ex.h + Logging_Event_Handler.cpp + Logging_Event_Handler.h + Logging_Event_Handler_Ex.cpp + Logging_Event_Handler_Ex.h + Logging_Handler.cpp + Logging_Handler.h + Reactor_Logging_Server.cpp + Reactor_Logging_Server.h + Reactor_Logging_Server_T.cpp + +Chapter 4 Select_Reactor_Logging_Server.cpp + TP_Reactor_Logging_Server.cpp + WFMO_Reactor_Logging_Server.cpp + +Chapter 5 Configurable_Logging_Server.cpp + Reactor_Logging_Server_Adapter.cpp + Reactor_Logging_Server_Adapter.h + Service_Reporter.cpp + Service_Reporter.h + Server_Shutdown.cpp + SLD.cpp + SLDEX_export.h + SLD_export.h + SLDex.cpp + +Chapter 6 Client_Logging_Daemon.cpp + CLD_export.h + TPLS_export.h + TP_Logging_Server.cpp + TP_Logging_Server.h + +Chapter 7 AC_CLD_export.h + AC_Client_Logging_Daemon.cpp + SR_Configurable_Logging_Server.cpp + TPC_Logging_Server.cpp + TPC_Logging_Server.h + TPCLS_export.h + +Chapter 8 AIO_CLD_export.h + AIO_Client_Logging_Daemon.cpp + +Chapter 9 display_logfile.cpp Microsoft Visual C++ users: --------------------------- diff --git a/tests/OS_Test.cpp b/tests/OS_Test.cpp index e1cf494af22..243f40ce846 100644 --- a/tests/OS_Test.cpp +++ b/tests/OS_Test.cpp @@ -199,7 +199,6 @@ string_emulation_test (void) char strtok_r1[] = "A string of tokens"; char *strtok_r2; - ACE_ASSERT (ACE_OS_String::strcmp (ACE_OS_String::strtok_r (strtok_r1, " ", &strtok_r2), |