From a5970d390069cb343c38188503745ba5f8562db3 Mon Sep 17 00:00:00 2001 From: wilson_d Date: Wed, 3 Dec 2003 00:36:09 +0000 Subject: ChangeLogTag: Tue Dec 2 18:35:29 2003 Dale Wilson --- TAO/ChangeLog | 11 +++++++++++ TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h | 2 +- TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h | 4 ++-- TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h | 10 +++++----- TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h | 2 +- TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp | 12 +++++------- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 752dd99a730..7785cd4703f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Dec 2 18:35:29 2003 Dale Wilson + + * orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h: + * orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h: + * orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h: + * orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h: + Fuzz reports trailing spaces. + + * orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp: + Build warnings on linux. + Tue Dec 2 17:26:14 2003 Dale Wilson * orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h index eaa065a6d6c..8fd7d844619 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h @@ -84,7 +84,7 @@ private: /// Flag that dictates whether or not the destructor will perform /// cleanup. int released_; - + }; diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h index de96b0bf840..ceb1912e470 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h @@ -33,7 +33,7 @@ * This class acts as a facade for the PortableGroup library to the * ORB. */ -class TAO_PortableGroup_Export TAO_PortableGroup_Loader +class TAO_PortableGroup_Export TAO_PortableGroup_Loader : public ACE_Service_Object { friend class TAO_POA_Hooks; @@ -58,7 +58,7 @@ ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PortableGroup_Loader) typedef int (*TAO_Module_Initializer) (void); static TAO_Module_Initializer -TAO_Requires_PortableGroup_Initializer = +TAO_Requires_PortableGroup_Initializer = &TAO_PortableGroup_Loader::Initializer; #else diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h index d0a3fa4d2bc..185cad17d0d 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.h @@ -67,11 +67,11 @@ class TAO_PortableGroup_Export TAO_Portable_Group_Map { public: - /** - * @struct Map_Entry - * - * @brief Value field of the portable group map. - */ + /** + * @struct Map_Entry + * + * @brief Value field of the portable group map. + */ struct Map_Entry { /// The key. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h index c259c04f960..5be819f9668 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h @@ -106,7 +106,7 @@ protected: * virtual to allow a derived class implementation to be invoked * instead. */ - virtual int open_i (const ACE_INET_Addr &addr, + virtual int open_i (const ACE_INET_Addr &addr, ACE_Reactor *reactor); /// Parse protocol specific options. diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp index 5e81d2379dc..985541869c5 100644 --- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp @@ -327,10 +327,11 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group ( if (this->have_replication_manager_) { - group = this->replication_manager_->add_member (group, - info.the_location, - created_obj.in () - ACE_ENV_ARG_PARAMETER); + group = this->replication_manager_->add_member ( + group.in (), + info.the_location, + created_obj.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CORBA::Object::_nil ()); } } @@ -351,9 +352,6 @@ CORBA::Object_ptr TAO::Object_Group_Creator::create_group ( "%T %n (%P|%t) Object_Group_Creator: Successfully created group of %s\n", role )); - - const char * group_iogr = orb_->object_to_string (group.in () ACE_ENV_ARG_PARAMETER ); - ACE_CHECK_RETURN (CORBA::Object::_nil ()); } return group._retn (); -- cgit v1.2.1