diff options
Diffstat (limited to 'TAO/performance-tests/POA/Demux/demux_test_server.cpp')
| -rw-r--r-- | TAO/performance-tests/POA/Demux/demux_test_server.cpp | 41 |
1 files changed, 6 insertions, 35 deletions
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index cf412600eb1..17bf6f90330 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -47,8 +47,6 @@ int Demux_Test_Server::init (int argc, char *argv [], CORBA::Environment &env) { -printf ("here\n"); - this->argc_ = argc; this->argv_ = argv; @@ -111,9 +109,6 @@ printf ("here\n"); // now parse the rest of the arguments to determine the POA depth, the number // of objects with each POA and other info - ACE_DEBUG ((LM_DEBUG, - "Before Parse Args\n")); - if (this->parse_args () == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) Demux_Test_Server::init - " @@ -241,13 +236,7 @@ printf ("here\n"); // activate the object TAO_TRY_EX (ACTIVATE_OBJ) { - Demux_Test_i * demux_test_i_ptr; - ACE_NEW_RETURN (demux_test_i_ptr, - Demux_Test_i, - -1); - - //id = this->child_poa_[i]->activate_object (&this->demux_test_[j], - id = this->child_poa_[i]->activate_object (demux_test_i_ptr, + id = this->child_poa_[i]->activate_object (&this->demux_test_[i][j], TAO_TRY_ENV); TAO_CHECK_ENV_EX (ACTIVATE_OBJ); } @@ -484,30 +473,12 @@ Demux_Test_Server::run (CORBA::Environment &env) return 0; } -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - -template class ACE_Function_Timeprobe<ACE_Timeprobe<ACE_Null_Mutex> >; -template class ACE_Unbounded_Set<ACE_Event_Descriptions>; -template class ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>; -template class ACE_Node<ACE_Event_Descriptions>; - -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) - -#pragma instantiate ACE_Function_Timeprobe<ACE_Timeprobe<ACE_Null_Mutex> > -#pragma instantiate ACE_Unbounded_Set<ACE_Event_Descriptions> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions> -#pragma instantiate ACE_Node<ACE_Event_Descriptions> - -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ - - - - - - - - +// #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +// template class ACE_Function_Timeprobe<ACE_Timeprobe<ACE_Null_Mutex>>; +// #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +// #pragma instantiate ACE_Function_Timeprobe<ACE_Timeprobe<ACE_Null_Mutex>>; +// #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |