diff options
| author | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-28 23:38:27 +0000 |
|---|---|---|
| committer | wilson_d <wilson_d@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-11-28 23:38:27 +0000 |
| commit | eb33a743de645b64616e0dd2a66e17440325c82c (patch) | |
| tree | dcae543835c98ccec663ab39f705f103aeb2e1de | |
| parent | 426e60f7d49485129a95476ac4738c39c50d94bb (diff) | |
| download | ATCD-eb33a743de645b64616e0dd2a66e17440325c82c.tar.gz | |
ChangeLogTag: Fri Nov 28 17:37:36 2003 Dale Wilson <wilson_d@ociweb.com>
5 files changed, 17 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 7e466ab0678..e55f923307d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 28 17:37:36 2003 Dale Wilson <wilson_d@ociweb.com> + + * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp: + Linux/gcc build errors/warnings. + Fri Nov 28 16:52:43 2003 Dale Wilson <wilson_d@ociweb.com> * tao/IORManipulation/IORManipulation.h: @@ -7,7 +15,7 @@ Fri Nov 28 16:52:43 2003 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h: * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp: - New files factor out IOGR creation and manipulation + New files factor out IOGR creation and manipulation from PG_Object_Group and PG_ObjectGroupManager * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h: @@ -22,7 +30,7 @@ Fri Nov 28 16:52:43 2003 Dale Wilson <wilson_d@ociweb.com> * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h: * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp: Fuzz from last checkin. - + Fri Nov 28 11:36:06 2003 Dale Wilson <wilson_d@ociweb.com> diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index cefa02aecd5..d12a83c3c95 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -516,7 +516,6 @@ TAO_PG_ObjectGroupManager::create_object_group ( CORBA::Object_var object_group = manipulator_.create_object_group ( type_id, domain_id, - the_criteria, group_id ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (PortableGroup::ObjectGroup::_nil()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h index a793b214190..4cbba398ede 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h @@ -113,8 +113,11 @@ namespace TAO /** * Private constructor -- use static create method. + * NOTE: gcc complains about private constructor so + * make it protected. Now it really should complain + * about non-virtual destructor, but it's not that smart. */ - private: + protected: PG_Object_Group ( CORBA::ORB_ptr orb, TAO::PG_Object_Group_Manipulator * manipulator, diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp index e59d4817983..631c7a8ba0a 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.cpp @@ -59,8 +59,7 @@ PortableGroup::ObjectGroup_ptr TAO::PG_Object_Group_Manipulator::create_object_group ( const char * type_id, const char * domain_id, - const PortableGroup::Criteria & the_criteria, - PortableGroup::ObjectGroupId & group_id + PortableGroup::ObjectGroupId & group_id ACE_ENV_ARG_DECL) { allocate_ogid(group_id); @@ -143,6 +142,8 @@ PortableGroup::ObjectGroup_ptr TAO::PG_Object_Group_Manipulator::remove_profiles void dump_membership (const char * label, PortableGroup::ObjectGroup_ptr member) { + ACE_UNUSED_ARG (label); + ACE_UNUSED_ARG (member); #if 0 PortableGroup::TagFTGroupTaggedComponent ft_tag_component; TAO_FT_IOGR_Property prop (ft_tag_component); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h index 4f99ac244ec..020b17d194e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h @@ -55,7 +55,6 @@ namespace TAO PortableGroup::ObjectGroup_ptr create_object_group ( const char * type_id, const char * domain_id, - const PortableGroup::Criteria & the_criteria, PortableGroup::ObjectGroupId & group_id ACE_ENV_ARG_DECL); |