summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/Naming
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming')
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp7
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h4
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp10
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h3
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp4
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h7
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp1
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h2
23 files changed, 0 insertions, 62 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
index 4a3c0bafc58..8d86516f2a9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.cpp
@@ -314,7 +314,6 @@ void
TAO_FT_Naming_Manager::set_default_properties (
const PortableGroup::Properties & props)
{
-
this->properties_support_.set_default_properties (props);
//@@ validate properties?
}
@@ -364,7 +363,6 @@ TAO_FT_Naming_Manager::set_properties_dynamically (
PortableGroup::ObjectGroup_ptr object_group,
const PortableGroup::Properties & overrides)
{
-
TAO::PG_Object_Group * group = 0;
if (this->group_factory_.find_group (object_group, group))
{
@@ -451,7 +449,6 @@ TAO_FT_Naming_Manager::add_member (
if (this->group_factory_.find_group (object_group, group))
{
try {
-
group->add_member (the_location,
member);
}
@@ -464,7 +461,6 @@ TAO_FT_Naming_Manager::add_member (
}
result = group->reference ();
-
}
else
{
@@ -567,7 +563,6 @@ PortableGroup::ObjectGroupId
TAO_FT_Naming_Manager::get_object_group_id (
PortableGroup::ObjectGroup_ptr object_group)
{
-
if (CORBA::is_nil (object_group))
{
ORBSVCS_DEBUG ((LM_DEBUG,
@@ -661,7 +656,6 @@ TAO_FT_Naming_Manager::get_member_ref (
PortableGroup::ObjectGroup_ptr object_group,
const PortableGroup::Location & the_location)
{
-
if (CORBA::is_nil (object_group))
{
ORBSVCS_DEBUG ((LM_DEBUG,
@@ -743,7 +737,6 @@ TAO_FT_Naming_Manager::delete_object (
const PortableGroup::GenericFactory::FactoryCreationId &
factory_creation_id)
{
-
PortableGroup::ObjectGroupId group_id = 0;
if (factory_creation_id >>= group_id)
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
index b57c6786a03..5dac7989663 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h
@@ -107,7 +107,6 @@ public:
* Methods required by the PortableGroup::PropertyManager interface.
*/
//@{
-
/// Set the default properties to be used by all object groups.
virtual void set_default_properties (
const PortableGroup::Properties & props);
@@ -167,7 +166,6 @@ public:
* interface.
*/
//@{
-
/// Create a member using the load balancer ObjectGroupManager, and
/// add the created object to the ObjectGroup.
virtual PortableGroup::ObjectGroup_ptr create_member (
@@ -230,7 +228,6 @@ public:
* Methods required by the PortableGroup::GenericFactory interface.
*/
//@{
-
/**
* Create an object of the specified type that adheres to the
* restrictions defined by the provided Criteria. The out
@@ -321,7 +318,6 @@ private:
* and Random are supported.
*/
//@{
-
/// The "RoundRobin" load balancing strategy.
TAO_FT_Round_Robin round_robin_;
/// The "Random" load balancing strategy.
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
index ae18aa384f8..82966a97945 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.cpp
@@ -163,7 +163,6 @@ TAO_FT_Naming_Replication_Manager::svc ()
}
try
{
-
this->orb_->run ();
}
catch (const CORBA::SystemException &ex)
@@ -349,7 +348,6 @@ TAO_FT_Naming_Replication_Manager::send_context_update (const ACE_CString & name
void
TAO_FT_Naming_Replication_Manager::send_registration (bool use_combo_refs)
{
-
if (TAO_debug_level > 1)
{
ORBSVCS_DEBUG((LM_INFO,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index b9bd3c43792..91496594ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -126,7 +126,6 @@ TAO_FT_Naming_Server::update_info_i ()
void
TAO_FT_Naming_Server::update_info (FT_Naming::UpdateInfoSeq &infos)
{
-
CORBA::ULong count = infos.length();
FT_Naming::UpdateInfo* guts = infos.get_buffer(true);
FT_Naming::UpdateInfoSeq_var block = 0;
@@ -322,7 +321,6 @@ TAO_FT_Naming_Server::init_naming_manager_with_orb (int, ACE_TCHAR *[], CORBA::O
this->naming_manager_.initialize (this->orb_.in (),
this->naming_manager_poa_.in ());
-
}
catch (const CORBA::Exception& ex)
{
@@ -412,7 +410,6 @@ TAO_FT_Naming_Server::init_replication_pairing ()
void
TAO_FT_Naming_Server::no_replica ()
{
-
if (this->server_role_ == BACKUP)
{
this->recover_iors ();
@@ -931,7 +928,6 @@ TAO_FT_Naming_Server::combine_iors (FT_Naming::EntityKind kind, CORBA::Object_pt
}
else
{
-
this->assign (combo, false, iorm->add_profiles (peer,
this->iors_[local].ref_.in ()));
}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
index d9637040909..b1fbdc028a0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.cpp
@@ -50,7 +50,6 @@ TAO_FT_Persistent_Naming_Context::resolve (const CosNaming::Name& n)
// Get the locations of the object group members and we will use them to
// do the load balancing
try {
-
// Make sure object is an object group.
// We will return the object reference all the way back out to the client
// if not
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
index 8a6251771c0..4d793870ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h
@@ -60,7 +60,6 @@ public:
protected:
static TAO_FT_Naming_Manager *naming_manager_impl_;
-
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
index 93023f53754..a7e0034a1f9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.cpp
@@ -54,7 +54,6 @@ TAO_FT_Storable_Naming_Context::resolve (const CosNaming::Name& n)
CORBA::Object_var resolved_ref = TAO_Storable_Naming_Context::resolve(n);
try {
-
// Make sure object is an object group.
// We will return the object reference as is all the way back
// out to the client if not
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
index cbd60eff80a..572b5251d65 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h
@@ -96,11 +96,9 @@ public:
virtual bool is_obsolete (time_t stored_time);
protected:
-
static TAO_FT_Naming_Manager *naming_manager_;
bool stale_;
TAO_FT_Naming_Replication_Manager *replicator_;
-
};
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
index 3bd9059c4ca..800b09cbb2f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/nsgroup_svc.cpp
@@ -40,7 +40,6 @@ NS_group_svc::determine_policy_string (const ACE_TCHAR *policy,
int
NS_group_svc::set_orb( CORBA::ORB_ptr orb)
{
-
this->orb_ = CORBA::ORB::_duplicate (orb);
if (CORBA::is_nil (this->orb_.in ()))
@@ -59,7 +58,6 @@ NS_group_svc::set_orb( CORBA::ORB_ptr orb)
int
NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm)
{
-
this->naming_manager_ = FT_Naming::NamingManager::_duplicate (nm);
if (CORBA::is_nil (this->naming_manager_.in ()))
@@ -77,7 +75,6 @@ NS_group_svc::set_naming_manager (FT_Naming::NamingManager_ptr nm)
int
NS_group_svc::set_name_context( CosNaming::NamingContextExt_ptr nc)
{
-
this->name_service_ = CosNaming::NamingContextExt::_duplicate (nc);
if (CORBA::is_nil (this->name_service_.in ()))
@@ -235,7 +232,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name,
try
{
-
PortableGroup::ObjectGroup_var group_var =
this->naming_manager_->get_object_group_ref_from_name
(ACE_TEXT_ALWAYS_CHAR(group_name));
@@ -254,7 +250,6 @@ NS_group_svc::group_bind (const ACE_TCHAR* group_name,
CosNaming::Name_var name = this->name_service_->to_name ( str.in() );
this->name_service_->rebind (name.in(), group_var.in());
-
}
catch (const CosNaming::NamingContextExt::InvalidName& )
{
@@ -370,7 +365,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path)
}
catch (const CORBA::Exception& )
{
-
if (TAO_debug_level > 2)
{
ORBSVCS_ERROR ((LM_ERROR,
@@ -390,7 +384,6 @@ NS_group_svc::group_unbind (const ACE_TCHAR* path)
int
NS_group_svc::group_list ()
{
-
// KCS: The group list is independent of locations. I created a new operation in the
// naming manager IDL to support requesting the group list - which is a list of names
@@ -435,7 +428,6 @@ NS_group_svc::display_load_policy_group(FT_Naming::LoadBalancingStrategyValue st
display_label));
if ( list->length () > 0 )
{
-
for (unsigned int i = 0; i < list->length (); ++i)
{
CORBA::String_var s = CORBA::string_dup (list[i]);
@@ -621,7 +613,6 @@ NS_group_svc::member_add (const ACE_TCHAR* group_name,
group_var = this->naming_manager_->add_member (group_var.in(),
location_name,
ior_var.in());
-
}
catch (const PortableGroup::ObjectGroupNotFound&)
{
@@ -841,7 +832,6 @@ NS_group_svc::member_show (const ACE_TCHAR* group_name,
}
catch (const PortableGroup::ObjectGroupNotFound&)
{
-
if (TAO_debug_level > 2)
{
ORBSVCS_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
index 100612561c0..ca66d6f9fd6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
@@ -48,9 +48,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
*/
class TAO_Naming_Serv_Export TAO_Bindings_Map
{
-
public:
-
/// Destructor.
virtual ~TAO_Bindings_Map (void);
@@ -94,7 +92,6 @@ public:
const char * kind,
CORBA::Object_ptr & obj,
CosNaming::BindingType &type) = 0;
-
};
/**
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
index 11858f0ece8..2d0f3187ff1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -166,7 +166,6 @@ TAO_Naming_Context::to_string (const CosNaming::Name &n)
// Stringify the name
for (i=0; i < n.length (); ++i)
{
-
// Stringify Id
//
const char *id = n[i].id.in ();
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
index 3a89382918a..b4a98572a2a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -226,7 +226,6 @@ private:
const char *sn);
protected:
-
/// A concrete implementor of the NamingContext functions.
TAO_Naming_Context_Impl *impl_;
};
@@ -242,9 +241,7 @@ protected:
*/
class TAO_Naming_Serv_Export TAO_Naming_Context_Impl
{
-
public:
-
/// Destructor.
virtual ~TAO_Naming_Context_Impl (void);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
index 31cf92cecab..38c54893402 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -79,7 +79,6 @@ TAO_Naming_Loader::create_object (CORBA::ORB_ptr orb,
int argc,
ACE_TCHAR *argv[])
{
-
if (this->naming_server_ == 0)
{
ORBSVCS_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index d6017c77eea..c6634e80d49 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -572,7 +572,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
// Initialize Persistent Naming Service.
//
{
-
// Create Naming Context Implementation Factory to be used for the creation of
// naming contexts by the TAO_Persistent_Context_Index
TAO_Persistent_Naming_Context_Factory *naming_context_factory =
@@ -608,7 +607,6 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
TAO_ROOT_NAMING_CONTEXT,
context_size);
this->assign (size_t(ROOT), false, new_context.in());
-
}
#if !defined (CORBA_E_MICRO)
@@ -787,7 +785,6 @@ TAO_Naming_Server::fini ()
{
if (!CORBA::is_nil (this->ns_poa_.in ()))
this->ns_poa_->destroy (1, 1);
-
}
catch (const CORBA::Exception&)
{
@@ -908,7 +905,6 @@ TAO_Naming_Server::bundle_at(size_t ndx) const
}
-
int
TAO_Naming_Server::write(size_t ndx) const
{
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
index 896f31bc96f..d042436d088 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -144,7 +144,6 @@ TAO_Persistent_Context_Index::init (size_t context_size)
// CASE 1:there are no Naming Contexts registered. We need to create
// one.
{
-
this->root_context_ =
TAO_Persistent_Naming_Context::make_new_context (poa_.in (),
TAO_ROOT_NAMING_CONTEXT,
@@ -222,7 +221,6 @@ TAO_Persistent_Context_Index::recreate_all ()
// If this is the root Naming Context, take a note of it.
if (context_impl->root ())
this->root_context_= result._retn ();
-
} while (index_iter->advance ());
return 0;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
index 771c2bed9c2..bbb96410dba 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp
@@ -6,7 +6,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
/// Constructor.
TAO_Persistent_Naming_Context_Factory::TAO_Persistent_Naming_Context_Factory ()
{
-
}
/// Destructor. Does not deallocate the hash map: if an instance of
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
index 9b113af9710..abb5b1edd81 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -307,7 +307,6 @@ bool
TAO_Storable_Naming_Context::
File_Open_Lock_and_Check::object_obsolete ()
{
-
// Query the underlying context if it is obsolete with respect
// to the provided file last-changed time
return (context_->is_obsolete (fl_->last_changed ()));
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
index 62735014be3..420fd723648 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -107,7 +107,6 @@ public:
const char * id (void);
const char * kind (void);
-
};
@@ -188,7 +187,6 @@ public:
CosNaming::BindingType &type);
private:
-
/// Helper: factors common code from <bind> and <rebind>.
int shared_bind (const char *id,
const char *kind,
@@ -200,7 +198,6 @@ private:
HASH_MAP map_;
CORBA::ORB_var orb_;
-
};
/**
@@ -348,7 +345,6 @@ public:
virtual void destroy (void);
protected:
-
/**
* A helper function to ensure the current object was not destroyed by raising
* an exception if it was. Uses the lock as a Reader.
@@ -433,7 +429,6 @@ class TAO_Naming_Serv_Export File_Open_Lock_and_Check :
public TAO::Storable_File_Guard
{
public:
-
/// Constructor
File_Open_Lock_and_Check (TAO_Storable_Naming_Context * context,
Method_Type method_type,
@@ -442,7 +437,6 @@ public:
~File_Open_Lock_and_Check ();
protected:
-
/// Check if the guarded object is current with the last
/// update which could have been performed independently of
/// the owner of this object.
@@ -470,7 +464,6 @@ private:
File_Open_Lock_and_Check(void);
TAO_Storable_Naming_Context * context_;
-
}; // end of embedded class File_Open_Lock_and_Check
friend class File_Open_Lock_and_Check;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
index f4f20070e81..b98b23b428c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -40,7 +40,6 @@ TAO_Storable_Naming_Context_Activator::incarnate (
const PortableServer::ObjectId &oid,
PortableServer::POA_ptr poa)
{
-
// Make sure complete initialization has been done
ACE_ASSERT (persistence_factory_ != 0);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
index 05a80e20651..ec3195f1a1f 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.cpp
@@ -274,7 +274,6 @@ TAO_Storable_Naming_Context_ReaderWriter::read_global (TAO_NS_Persistence_Global
}
global.counter(counter);
-
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
index b2f20ec58af..5bd4a7ebc8a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_ReaderWriter.h
@@ -36,7 +36,6 @@ class TAO_NS_Persistence_Global;
class TAO_Storable_Naming_Context_ReaderWriter
{
public:
-
TAO_Storable_Naming_Context_ReaderWriter (TAO::Storable_Base & stream);
int read (TAO_Storable_Naming_Context & context);
@@ -47,7 +46,6 @@ public:
void read_global (TAO_NS_Persistence_Global & global);
private:
-
void write_header (const TAO_NS_Persistence_Header & header);
void read_header (TAO_NS_Persistence_Header & header);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
index 0836bd43139..4f725cbb11e 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -12,7 +12,6 @@
#include "ace/OS_NS_stdio.h"
-
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
int
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
index b3f7fa3db5b..585b4a3f9fd 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -100,7 +100,6 @@ public:
CosNaming::BindingType &type);
private:
-
/// Helper: factors common code from <bind> and <rebind>.
int shared_bind (const char *id,
const char *kind,
@@ -172,7 +171,6 @@ public:
CosNaming::BindingIterator_out &bi);
protected:
-
/// Counter used for generation of POA ids for children Naming
/// Contexts.
ACE_UINT32 counter_;