From 9931bb4e27ddde10ccbf57c05b6ee4b25225a413 Mon Sep 17 00:00:00 2001 From: wilson_d Date: Sat, 29 Nov 2003 00:05:11 +0000 Subject: ChangeLogTag: Fri Nov 28 18:04:32 2003 Dale Wilson --- TAO/ChangeLog | 6 ++++++ TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp | 4 ++-- TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index e55f923307d..ef970dcf01e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 28 18:04:32 2003 Dale Wilson + + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h: + * orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp: + Linux/gcc build errors/warnings. + Fri Nov 28 17:37:36 2003 Dale Wilson * orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp index 28e58370698..3701d10aff6 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.cpp @@ -27,7 +27,7 @@ TAO_PG::Properties_Decoder::Properties_Decoder() TAO_PG::Properties_Decoder::Properties_Decoder ( const PortableGroup::Properties & property_set - ACE_ENV_SINGLE_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) : defaults_ (0) { @@ -37,7 +37,7 @@ TAO_PG::Properties_Decoder::Properties_Decoder ( TAO_PG::Properties_Decoder::Properties_Decoder ( const PortableGroup::Properties & property_set, Properties_Decoder * defaults - ACE_ENV_SINGLE_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) : defaults_ (defaults) { diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h index 165f3cfacaf..e35a0050f8f 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Decoder.h @@ -57,14 +57,16 @@ namespace TAO_PG * constructor * @param property_set the properties to be decoded */ - Properties_Decoder (const PortableGroup::Properties & property_set); + Properties_Decoder (const PortableGroup::Properties & property_set ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); /** * constructor with defaults * @param property_set the properties to be decoded * @param defaults a propert set decoder that supplies default values. */ - Properties_Decoder (const PortableGroup::Properties & property_set, Properties_Decoder * defaults); + Properties_Decoder (const PortableGroup::Properties & property_set, Properties_Decoder * defaults ACE_ENV_ARG_DECL) + ACE_THROW_SPEC ((CORBA::SystemException)); /** * constructor with defaults, but no properties (yet) -- cgit v1.2.1