diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-01-03 14:05:41 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2005-01-03 14:05:41 +0000 |
| commit | bbaa9706217fc34fe268d763d5e9f5c3c4ad76ce (patch) | |
| tree | b1ace9dccd8c84fbac392bb4fedfd1e6f008334d /TAO/orbsvcs | |
| parent | 1337832bc31f6a2bd33a92d30b005014c3d082b7 (diff) | |
| download | ATCD-bbaa9706217fc34fe268d763d5e9f5c3c4ad76ce.tar.gz | |
ChangeLogTag:Mon Jan 3 08:02:33 2005 Douglas C. Schmidt <schmidt@cs.wustl.edu>
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp | 10 | ||||
| -rw-r--r-- | TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp index bdd65e5223f..4f4e1a43829 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp @@ -118,7 +118,7 @@ ReplicaController (CORBA::ORB_ptr orb) ACE_DEBUG ((LM_DEBUG, "Becoming a member with id %s\n", uuid.to_string ()->c_str ())); - ACE_AUTO_PTR_RESET (group_, new TMCast::Group (address, uuid.to_string ()->c_str ()), TMCast::Group); + ACE_AUTO_PTR_RESET (group_, new ACE_TMCast::Group (address, uuid.to_string ()->c_str ()), ACE_TMCast::Group); int r = ACE_Thread_Manager::instance ()->spawn ( &ReplicaController::listener_thunk, this); @@ -190,12 +190,12 @@ listener () } } } - catch (TMCast::Group::Failed const&) + catch (ACE_TMCast::Group::Failed const&) { ACE_DEBUG ((LM_DEBUG, "Group failure. Perhaps, I am alone in the group.\n")); } - catch (TMCast::Group::InsufficienSpace const&) + catch (ACE_TMCast::Group::InsufficienSpace const&) { ACE_DEBUG ((LM_DEBUG, "Group::InsufficienSpace\n")); } @@ -403,13 +403,13 @@ ReplicaController::send_reply ( ACE_DEBUG ((LM_DEBUG, "Sent log record of length %i\n", size)); break; } - catch (TMCast::Group::Aborted const&) + catch (ACE_TMCast::Group::Aborted const&) { ACE_DEBUG ((LM_DEBUG, "Retrying to send log record.\n")); } } } - catch (TMCast::Group::Failed const&) + catch (ACE_TMCast::Group::Failed const&) { ACE_DEBUG ((LM_DEBUG, "Group failure. Perhaps, I am alone in the group.\n")); diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h index 551ae5fe5a9..07ae5071b8b 100644 --- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h +++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.h @@ -132,7 +132,7 @@ private: Log_ log_; CORBA::ORB_var orb_; PortableServer::POA_var root_poa_; - auto_ptr<TMCast::Group> group_; + auto_ptr<ACE_TMCast::Group> group_; }; #endif /* REPLICA_CONTROLLER_H */ |