diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-21 14:30:15 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-21 14:30:15 +0000 |
| commit | 278d77be5adf37710b02a28de9e5d93714cf8d8f (patch) | |
| tree | 7d2ae096b142e89bdfa17f22a5332a9e3178ac85 | |
| parent | ac75aec3e4c1e51539bf82b4ff5be4a250a75253 (diff) | |
| download | ATCD-278d77be5adf37710b02a28de9e5d93714cf8d8f.tar.gz | |
(main): replaced ACE_SCHED_FIFO with THR_SCHED_FIFO in activate calls.
| -rw-r--r-- | TAO/examples/Quoter/client.cpp | 12 | ||||
| -rw-r--r-- | TAO/tests/NestedUpcall/MT_Client_Test/client.cpp | 13 |
2 files changed, 13 insertions, 12 deletions
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp index f704fbc0968..cc5688e3568 100644 --- a/TAO/examples/Quoter/client.cpp +++ b/TAO/examples/Quoter/client.cpp @@ -122,7 +122,7 @@ Quoter_Client::run (void) ACE_DEBUG ((LM_DEBUG, "Copied object: ACE Hardware = %i\n", q)); // Move the Quoter - + exception_message = "While moving the quoter"; this->quoter_var_->move (factory_Finder_var_.in (), criteria, @@ -147,7 +147,7 @@ Quoter_Client::run (void) return -1; } ACE_ENDTRY; - + return 0; } @@ -263,8 +263,8 @@ Quoter_Client::init_naming_service (void) // Narrow it to a Quoter Generic Factory exception_message = "While narrowing the factory"; - generic_Factory_var_ = - CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (), + generic_Factory_var_ = + CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (), ACE_TRY_ENV); ACE_TRY_CHECK; @@ -390,7 +390,8 @@ main (int argc, char **argv) for (i = 0; i < threads; i++) - clients[i]->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY); + clients[i]->activate (THR_BOUND | THR_SCHED_FIFO, 1, 0 + ACE_DEFAULT_THREAD_PRIORITY); int result = ACE_Thread_Manager::instance ()->wait (); @@ -401,4 +402,3 @@ main (int argc, char **argv) return result; } - diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index af2e1e68945..d897625fee3 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -25,7 +25,7 @@ ACE_RCSID(MT_Client_Test, client, "$Id$") MT_Client_Task::MT_Client_Task (int argc, char **argv, - int client_number) + int client_number) : argc_ (argc), argv_ (argv), client_number_ (client_number) @@ -37,7 +37,7 @@ MT_Client_Task::svc (void) { if (this->mT_Client_.init (this->argc_, this->argv_, - this->client_number_) == -1) + this->client_number_) == -1) return 1; else return this->mT_Client_.run (); @@ -183,7 +183,7 @@ MT_Client::~MT_Client (void) int MT_Client::init (int argc, char **argv, - int client_number) + int client_number) { // Make a copy of argv since ORB_init will change it. @@ -280,7 +280,8 @@ main (int argc, char **argv) argc, argv, &orb_manager); - server->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY); + server->activate (THR_BOUND | THR_SCHED_FIFO, 1, 0, + ACE_DEFAULT_THREAD_PRIORITY); // starting the client threads MT_Client_Task **clients = new MT_Client_Task*[threads]; @@ -289,7 +290,8 @@ main (int argc, char **argv) clients[i] = new MT_Client_Task (argc, argv, i); for (i = 0; i < threads; i++) - clients[i]->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY); + clients[i]->activate (THR_BOUND | THR_SCHED_FIFO, 1, 0, + ACE_DEFAULT_THREAD_PRIORITY); int result = ACE_Thread_Manager::instance ()->wait (); @@ -307,4 +309,3 @@ main (int argc, char **argv) return result; } - |