diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-10 12:35:38 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-10 12:35:38 +0000 |
| commit | b5e2c949fe9e8068ef35488ce22ce7de5fc24077 (patch) | |
| tree | 4eb369edc0959daec23768e0c611749badeb48c5 | |
| parent | f929f4c5eb99ffbe447e2ccb8ba6e5b8e4769b51 (diff) | |
| download | ATCD-b5e2c949fe9e8068ef35488ce22ce7de5fc24077.tar.gz | |
ChangeLogTag:Fri May 10 12:19:59 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp | 2 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp | 2 | ||||
| -rw-r--r-- | examples/Map_Manager/test_hash_map_manager.cpp | 8 | ||||
| -rw-r--r-- | netsvcs/clients/Naming/Client/Client_Test.cpp | 2 |
7 files changed, 34 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 928acd1f9b3..445ec42f426 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Fri May 10 12:19:59 UTC 2002 Don Hinton <dhinton@ieee.org> + + * netsvc/clients/Naming/Client/Client_Test.cpp: + * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp: + * examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp: + * examples/Map_Manager/test_hash_map_manager.cpp: + + Changed assert to ACE_ASSERT. + Fri May 10 10:52:50 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/os_include/signal.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 928acd1f9b3..445ec42f426 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,12 @@ +Fri May 10 12:19:59 UTC 2002 Don Hinton <dhinton@ieee.org> + + * netsvc/clients/Naming/Client/Client_Test.cpp: + * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp: + * examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp: + * examples/Map_Manager/test_hash_map_manager.cpp: + + Changed assert to ACE_ASSERT. + Fri May 10 10:52:50 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/os_include/signal.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 928acd1f9b3..445ec42f426 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,12 @@ +Fri May 10 12:19:59 UTC 2002 Don Hinton <dhinton@ieee.org> + + * netsvc/clients/Naming/Client/Client_Test.cpp: + * examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp: + * examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp: + * examples/Map_Manager/test_hash_map_manager.cpp: + + Changed assert to ACE_ASSERT. + Fri May 10 10:52:50 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/os_include/signal.h: diff --git a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp index 165e370e87b..d922dc9b1b0 100644 --- a/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp +++ b/examples/ASX/Event_Server/Event_Server/Consumer_Router.cpp @@ -59,7 +59,7 @@ Consumer_Router::close (u_long) int Consumer_Router::svc (void) { - assert (this->is_writer ()); + ACE_ASSERT (this->is_writer ()); ACE_DEBUG ((LM_DEBUG, "(%t) starting svc in Consumer_Router\n")); diff --git a/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp b/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp index 7e2018a3d56..178924eaf37 100644 --- a/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp +++ b/examples/ASX/Event_Server/Event_Server/Supplier_Router.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Event_Server, Supplier_Router, "$Id$") int Supplier_Router::svc (void) { - assert (this->is_writer ()); + ACE_ASSERT (this->is_writer ()); ACE_DEBUG ((LM_DEBUG, "(%t) starting svc in Supplier_Router\n")); diff --git a/examples/Map_Manager/test_hash_map_manager.cpp b/examples/Map_Manager/test_hash_map_manager.cpp index dec80fc5488..3653bf46dea 100644 --- a/examples/Map_Manager/test_hash_map_manager.cpp +++ b/examples/Map_Manager/test_hash_map_manager.cpp @@ -53,8 +53,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TString name (key); ACE_TString value; - assert (hash.find (name, value) != -1); - assert (name == value); + ACE_ASSERT (hash.find (name, value) != -1); + ACE_ASSERT (name == value); } if (!ACE_OS::freopen (argv[3], ACE_TEXT("r"), stdin)) @@ -63,10 +63,10 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) while (ACE_OS::fgets (key, sizeof key, stdin)) { ACE_TString string (key); - assert (hash.unbind (string) != -1); + ACE_ASSERT (hash.unbind (string) != -1); } - assert (hash.current_size () == 0); + ACE_ASSERT (hash.current_size () == 0); fclose (stdin); } diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp index 72c7e9b8494..f82870a1177 100644 --- a/netsvcs/clients/Naming/Client/Client_Test.cpp +++ b/netsvcs/clients/Naming/Client/Client_Test.cpp @@ -362,7 +362,7 @@ Client_Test::list_options (void) this->name_options_->nameserver_port ())); break; default: - assert (!"shouldn't occur!\n"); + ACE_ASSERT (!"shouldn't occur!\n"); /* NOTREACHED */ } ACE_DEBUG ((LM_DEBUG, |