diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-28 14:34:41 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-28 14:34:41 +0000 |
| commit | 657b49518e642d1ea97033df067e360f92ef2d95 (patch) | |
| tree | acd039545ee28fd2fcbd9f8c4e4b073c7784a0f4 | |
| parent | 8631d20bb3c06bce9c679dfcbddce9620ff6de5f (diff) | |
| download | ATCD-657b49518e642d1ea97033df067e360f92ef2d95.tar.gz | |
ChangeLogTag: Fri Nov 28 08:33:56 2003 Dale Wilson <wilson_d@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp | 14 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h | 4 |
4 files changed, 21 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4a83e6604fa..93e63250f04 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,10 +1,17 @@ +Fri Nov 28 08:33:56 2003 Dale Wilson <wilson_d@ociweb.com> + + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp: + Build problems on Linux: const correctness. + Wed Nov 26 19:20:54 2003 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h: * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp: Enhance Properties_Decoder to provide everything necessary - to implement the PropertyManager interface. - --the name is no longer ideal. + to implement the PropertyManager interface. + --the name is no longer ideal. * orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h: * orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp index 1653eda447e..eec57ae0bdd 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp @@ -66,9 +66,9 @@ void TAO_PG::Properties_Decoder::decode (const PortableGroup::Properties & prope const CosNaming::NameComponent & nc = nsName[0]; ACE_CString name = ACE_static_cast (const char *, nc.id); - PortableGroup::Value * value_copy; + const PortableGroup::Value * value_copy; ACE_NEW_THROW_EX (value_copy, PortableGroup::Value (property.val), CORBA::NO_MEMORY ()); - PortableGroup::Value * replaced_value; + const PortableGroup::Value * replaced_value; if (0 == this->values_.rebind (name, value_copy, replaced_value)) { if (0 != replaced_value) @@ -122,7 +122,7 @@ void TAO_PG::Properties_Decoder::remove (const PortableGroup::Properties & prope const CosNaming::NameComponent & nc = nsName[0]; ACE_CString name = ACE_static_cast (const char *, nc.id); - PortableGroup::Value * deleted_value; + const PortableGroup::Value * deleted_value; if ( 0 == this->values_.unbind (name, deleted_value)) { delete deleted_value; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp index a24a7169484..f0797660b6f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.cpp @@ -17,24 +17,24 @@ template class ACE_Hash_Map_Manager< ACE_CString, - const ::TAO_PG::Properties_Decoder *, + ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX>; template class ACE_Hash_Map_Iterator< - ACE_CString, - const ::TAO_PG::Properties_Decoder *, + ACE_CString, + ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate ACE_Hash_Map_Manager< ACE_CString, - const ::TAO_PG::Properties_Decoder *, - TAO_SYNCH_MUTEX> + ::TAO_PG::Properties_Decoder *, + TAO_SYNCH_MUTEX> # pragma instantiate ACE_Hash_Map_Iterator< - ACE_CString, - const ::TAO_PG::Properties_Decoder *, + ACE_CString, + ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h index 79082ecb854..acd30853e04 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Typeid_Properties_Map.h @@ -19,11 +19,11 @@ namespace TAO { typedef ACE_Hash_Map_Manager< ACE_CString, - const ::TAO_PG::Properties_Decoder *, + ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX> PG_Typeid_Properties_Map; typedef ACE_Hash_Map_Iterator< ACE_CString, - const ::TAO_PG::Properties_Decoder *, + ::TAO_PG::Properties_Decoder *, TAO_SYNCH_MUTEX> PG_Typeid_Properties_Map_Iterator; } //namespace TAO_PG |