diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-20 17:55:20 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-03-20 17:55:20 +0000 |
| commit | 24b3e3d3cbcf56a6deb2ed9f2b9654916660c318 (patch) | |
| tree | 5d8024a28ee13756c6c6a459832242168aff31fa | |
| parent | 0c51c9fa2f6da1c0f1af1bc5273b56573c511926 (diff) | |
| download | ATCD-24b3e3d3cbcf56a6deb2ed9f2b9654916660c318.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 10 | ||||
| -rw-r--r-- | TAO/tests/NestedUpcall/client.cpp | 17 |
2 files changed, 20 insertions, 7 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 9ac0ff4e6d4..3bb5daae027 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,7 +1,13 @@ +Fri Mar 20 11:53:15 1998 Nanbor Wang <nanbor@cs.wustl.edu> + + * tests/NestedUpcall/client.cpp: Use EventHandler_vare.in() to + pass in a pointer. Added explicit template instantiation + codes. + Fri Mar 20 09:46:50 1998 Carlos O'Ryan <coryan@cs.wustl.edu> - * orbsvcs/orbsvcs/Event/Memory_Pools.h: - * orbsvcs/orbsvcs/Event/Memory_Pools.cpp: + * orbsvcs/orbsvcs/Event/Memory_Pools.h: + * orbsvcs/orbsvcs/Event/Memory_Pools.cpp: Locks are needed for the memory pool singletons; thanks to Thomas Venturella <tventurell@mdc.com> for detecting this. diff --git a/TAO/tests/NestedUpcall/client.cpp b/TAO/tests/NestedUpcall/client.cpp index 771bbfeb85b..b47d00f2035 100644 --- a/TAO/tests/NestedUpcall/client.cpp +++ b/TAO/tests/NestedUpcall/client.cpp @@ -41,7 +41,7 @@ parse_args (int argc_, char* argv_[]) break; case 'f': { - FILE *ior_file_ = + FILE *ior_file_ = ACE_OS::fopen (get_opts.optarg,"r"); if (ior_file_ == 0) @@ -143,11 +143,11 @@ main (int argc, char *argv[]) "%s: %p\n", argv[0], "unable to get the ORB Core to listen"), -1); - + // Now, after all that, we can invoke an operation on the remote // side. - CORBA::Long r = remote_reactor->register_handler (eh, TAO_TRY_ENV); - + CORBA::Long r = remote_reactor->register_handler (eh.in (), TAO_TRY_ENV); + // We ought to have a result! ACE_DEBUG ((LM_DEBUG, "%s: received %d as return from register_handler ()\n", @@ -156,7 +156,7 @@ main (int argc, char *argv[]) remote_reactor->set_value (TAO_TRY_ENV); TAO_CHECK_ENV; - remote_reactor->decrement (eh, 5, TAO_TRY_ENV); + remote_reactor->decrement (eh.in (), 5, TAO_TRY_ENV); TAO_CHECK_ENV; remote_reactor->stop (TAO_TRY_ENV); @@ -172,3 +172,10 @@ main (int argc, char *argv[]) return 0; } +#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) +template class auto_ptr<EventHandler_i>; +template class ACE_Auto_Basic_Ptr<EventHandler_i>; +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +#pragma instantiate auto_ptr<EventHandler_i> +#pragma instantiate ACE_Auto_Basic_Ptr<EventHandler_i> +#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |