diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-27 01:26:44 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-27 01:26:44 +0000 |
| commit | 8631d20bb3c06bce9c679dfcbddce9620ff6de5f (patch) | |
| tree | 391559bf97db59247c47c02a06d0be981e26d705 | |
| parent | f0f5433b7acac9169d04a04b8c6beb0a827e1c13 (diff) | |
| download | ATCD-8631d20bb3c06bce9c679dfcbddce9620ff6de5f.tar.gz | |
ChangeLogTag: Wed Nov 26 19:20:54 2003 Dale Wilson <wilson_d@ociweb.com>
4 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index 53b3d962e6e..704513567da 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -588,13 +588,13 @@ TAO::FT_ReplicationManager::set_type_properties ( ACE_ENV_ARG_PARAMETER); ACE_CHECK; - + TAO_PG::Properties_Decoder * typeid_properties; if ( 0 != this->typeid_properties_map_.find (type_id, typeid_properties)) { ACE_NEW_THROW_EX ( - typeid_properties, - TAO_PG::Properties_Decoder (overrides, & this->default_properties_), + typeid_properties, + TAO_PG::Properties_Decoder (overrides, & this->default_properties_), CORBA::NO_MEMORY()); this->typeid_properties_map_.bind (type_id, typeid_properties); } @@ -623,7 +623,7 @@ TAO::FT_ReplicationManager::get_type_properties ( typeid_properties->export_properties (*result ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - return result._retn (); + return result._retn (); #endif } @@ -977,8 +977,8 @@ TAO::FT_ReplicationManager::create_object ( if ( 0 != this->typeid_properties_map_.find (type_id, typeid_properties)) { ACE_NEW_THROW_EX ( - typeid_properties, - TAO_PG::Properties_Decoder (& this->default_properties_), + typeid_properties, + TAO_PG::Properties_Decoder (& this->default_properties_), CORBA::NO_MEMORY()); this->typeid_properties_map_.bind (type_id, typeid_properties); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp index 59663d60ef8..1653eda447e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp @@ -30,7 +30,7 @@ TAO_PG::Properties_Decoder::Properties_Decoder (const PortableGroup::Properties } TAO_PG::Properties_Decoder::Properties_Decoder ( - const PortableGroup::Properties & property_set, + const PortableGroup::Properties & property_set, Properties_Decoder * defaults) : defaults_ (defaults) { @@ -312,8 +312,8 @@ int TAO_PG::test_encode_decode () ACE_SYNCH_NULL_MUTEX>; typedef class ACE_Hash_Map_Iterator< - ACE_CString, - const PortableGroup::Value *, + ACE_CString, + const PortableGroup::Value *, ACE_SYNCH_NULL_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -323,8 +323,8 @@ int TAO_PG::test_encode_decode () const PortableGroup::Value *, ACE_SYNCH_NULL_MUTEX> #pragma instantiate ACE_Hash_Map_Iterator< - ACE_CString, - const PortableGroup::Value *, + ACE_CString, + const PortableGroup::Value *, ACE_SYNCH_NULL_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h index 6b4c1e4af3c..9730edcb7db 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h @@ -39,8 +39,8 @@ namespace TAO_PG const PortableGroup::Value *, ACE_SYNCH_NULL_MUTEX> ValueMap; typedef ACE_Hash_Map_Iterator< - ACE_CString, - const PortableGroup::Value *, + ACE_CString, + const PortableGroup::Value *, ACE_SYNCH_NULL_MUTEX> ValueMapIterator; public: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h index 1a9899bfd58..79082ecb854 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h @@ -22,7 +22,7 @@ namespace TAO const ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX> PG_Typeid_Properties_Map; typedef ACE_Hash_Map_Iterator< - ACE_CString, + ACE_CString, const ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX> PG_Typeid_Properties_Map_Iterator; } //namespace TAO_PG |