diff options
| author | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-27 18:36:25 +0000 |
|---|---|---|
| committer | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-27 18:36:25 +0000 |
| commit | 23e0caa4a345064689e654a269cd25f40db28e3f (patch) | |
| tree | e309dc609f4fd08c57fbb1cff9c7e7c7d8750301 | |
| parent | dc2f78d81a1e18c4a86685700808ba45f89e2521 (diff) | |
| download | ATCD-23e0caa4a345064689e654a269cd25f40db28e3f.tar.gz | |
Mon Nov 27 12:33:23 2000 Pradeep Gore <pradeep@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/Trading_Service/Trading_Service.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 9e1fa808470..066616c3c94 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Mon Nov 27 12:33:23 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * orbsvcs/Trading_Service/Trading_Service.cpp: + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: + Removed auto_ptr and ACE_Auto_Basic_Ptr from Trading_Service.cpp + and added it back to Trading_Loader.cpp. + Sun Nov 26 19:47:25 2000 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Invocation.cpp (start): Reset the reply_received field in diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp index 819155e826d..423fad6ec41 100644 --- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp +++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp @@ -85,9 +85,7 @@ Trading_Service::shutdown (void) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class auto_ptr<TAO_Trader_Factory::TAO_TRADER>; -template class ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER>; + #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate auto_ptr<TAO_Trader_Factory::TAO_TRADER> -#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index 57ba23f18e0..74a27ebc6c6 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -456,9 +456,13 @@ ACE_FACTORY_DEFINE (TAO_Trading, TAO_Trading_Loader) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class ACE_Dynamic_Service<TAO_Trading_Loader>; +template class auto_ptr<TAO_Trader_Factory::TAO_TRADER>; +template class ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate ACE_Dynamic_Service<TAO_Trading_Loader> +#pragma instantiate auto_ptr<TAO_Trader_Factory::TAO_TRADER> +#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |