Merge branch 'master' into test-corba-is-nil

14 files changed, 38 insertions, 44 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index 99e681eb61a..09273977362 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -10,7 +10,7 @@ TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy (
 {
 }
 
-TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void)
+TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy ()
 {
 }
 
@@ -21,7 +21,7 @@ TAO::Security::EstablishTrustPolicy::policy_type ()
 }
 
 CORBA::Policy_ptr
-TAO::Security::EstablishTrustPolicy::copy (void)
+TAO::Security::EstablishTrustPolicy::copy ()
 {
   TAO::Security::EstablishTrustPolicy *policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -36,12 +36,12 @@ TAO::Security::EstablishTrustPolicy::copy (void)
 }
 
 void
-TAO::Security::EstablishTrustPolicy::destroy (void)
+TAO::Security::EstablishTrustPolicy::destroy ()
 {
 }
 
 ::Security::EstablishTrust
-TAO::Security::EstablishTrustPolicy::trust (void)
+TAO::Security::EstablishTrustPolicy::trust ()
 {
   return this->trust_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index 9d41415ebd2..6fac5016428 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -9,18 +9,18 @@ TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop)
 {
 }
 
-TAO::Security::QOPPolicy::~QOPPolicy (void)
+TAO::Security::QOPPolicy::~QOPPolicy ()
 {
 }
 
 CORBA::PolicyType
-TAO::Security::QOPPolicy::policy_type (void)
+TAO::Security::QOPPolicy::policy_type ()
 {
   return ::Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
-TAO::Security::QOPPolicy::copy (void)
+TAO::Security::QOPPolicy::copy ()
 {
   TAO::Security::QOPPolicy * policy = 0;
   ACE_NEW_THROW_EX (policy,
@@ -35,12 +35,12 @@ TAO::Security::QOPPolicy::copy (void)
 }
 
 void
-TAO::Security::QOPPolicy::destroy (void)
+TAO::Security::QOPPolicy::destroy ()
 {
 }
 
 Security::QOP
-TAO::Security::QOPPolicy::qop (void)
+TAO::Security::QOPPolicy::qop ()
 {
   return this->qop_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
index 0dfb18dcc59..6590858dfe5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp
@@ -27,7 +27,7 @@ TAO::Security::SecurityManager::SecurityManager (/* unknown */)
   this->access_decision_ = ad;
 }
 
-TAO::Security::SecurityManager::~SecurityManager (void)
+TAO::Security::SecurityManager::~SecurityManager ()
 {
 }
 
@@ -315,7 +315,7 @@ TAO::Security::AccessDecision::remove_object
 }
 
 CORBA::Boolean
-TAO::Security::AccessDecision::default_decision (void)
+TAO::Security::AccessDecision::default_decision ()
 {
   return this->default_allowance_decision_;
 }
@@ -327,7 +327,7 @@ TAO::Security::AccessDecision::default_decision (CORBA::Boolean d)
 }
 
 CORBA::Boolean
-TAO::Security::AccessDecision::default_collocated_decision (void)
+TAO::Security::AccessDecision::default_collocated_decision ()
 {
   return this->default_collocated_decision_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
index 525dcf71228..9f1af843b94 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -18,7 +18,7 @@ TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy (
 {
 }
 
-TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void)
+TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy ()
 {
 }
 
@@ -29,7 +29,7 @@ TAO::SL3::ContextEstablishmentPolicy::creds_directive ()
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ContextEstablishmentPolicy::creds_list (void)
+TAO::SL3::ContextEstablishmentPolicy::creds_list ()
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
 
@@ -71,7 +71,7 @@ TAO::SL3::ContextEstablishmentPolicy::policy_type ()
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ContextEstablishmentPolicy::copy (void)
+TAO::SL3::ContextEstablishmentPolicy::copy ()
 {
   CORBA::Policy_ptr p = CORBA::Policy_ptr ();
   ACE_NEW_THROW_EX (p,
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
index 3cd971c403d..37104fb3940 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -2,7 +2,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory (void)
+TAO::SL3::CredentialsAcquirerFactory::~CredentialsAcquirerFactory ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
index 82d65bfe788..a1f9556ebb6 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -11,14 +11,14 @@ namespace TAO
   }
 }
 
-TAO::SL3::CredentialsCurator::CredentialsCurator (void)
+TAO::SL3::CredentialsCurator::CredentialsCurator ()
   : lock_ (),
     acquirer_factories_ (),
     credentials_table_ (TAO::SL3::CREDENTIALS_TABLE_SIZE)
 {
 }
 
-TAO::SL3::CredentialsCurator::~CredentialsCurator (void)
+TAO::SL3::CredentialsCurator::~CredentialsCurator ()
 {
   const Factory_Iterator fend = this->acquirer_factories_.end ();
   for (Factory_Iterator i = this->acquirer_factories_.begin ();
@@ -62,13 +62,13 @@ TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj)
 }
 
 TAO::SL3::CredentialsCurator_ptr
-TAO::SL3::CredentialsCurator::_nil (void)
+TAO::SL3::CredentialsCurator::_nil ()
 {
   return (CredentialsCurator *) 0;
 }
 
 SecurityLevel3::AcquisitionMethodList *
-TAO::SL3::CredentialsCurator::supported_methods (void)
+TAO::SL3::CredentialsCurator::supported_methods ()
 {
   SecurityLevel3::AcquisitionMethodList * list;
   ACE_NEW_THROW_EX (list,
@@ -115,7 +115,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials (
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::CredentialsCurator::default_creds_list (void)
+TAO::SL3::CredentialsCurator::default_creds_list ()
 {
   SecurityLevel3::OwnCredentialsList * list;
   ACE_NEW_THROW_EX (list,
@@ -146,7 +146,7 @@ TAO::SL3::CredentialsCurator::default_creds_list (void)
 }
 
 SecurityLevel3::CredentialsIdList *
-TAO::SL3::CredentialsCurator::default_creds_ids (void)
+TAO::SL3::CredentialsCurator::default_creds_ids ()
 {
   SecurityLevel3::CredentialsIdList * list;
   ACE_NEW_THROW_EX (list,
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
index f8f99982eff..ddda19ce6e9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -8,12 +8,12 @@ TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy (
 {
 }
 
-TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy (void)
+TAO::SL3::ObjectCredentialsPolicy::~ObjectCredentialsPolicy ()
 {
 }
 
 SecurityLevel3::OwnCredentialsList *
-TAO::SL3::ObjectCredentialsPolicy::creds_list (void)
+TAO::SL3::ObjectCredentialsPolicy::creds_list ()
 {
   SecurityLevel3::OwnCredentialsList * creds = 0;
 
@@ -31,7 +31,7 @@ TAO::SL3::ObjectCredentialsPolicy::policy_type ()
 }
 
 CORBA::Policy_ptr
-TAO::SL3::ObjectCredentialsPolicy::copy (void)
+TAO::SL3::ObjectCredentialsPolicy::copy ()
 {
   CORBA::Policy_ptr p = CORBA::Policy_ptr ();
   ACE_NEW_THROW_EX (p,
@@ -42,7 +42,7 @@ TAO::SL3::ObjectCredentialsPolicy::copy (void)
 }
 
 void
-TAO::SL3::ObjectCredentialsPolicy::destroy (void)
+TAO::SL3::ObjectCredentialsPolicy::destroy ()
 {
   this->creds_list_.length (0);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
index 582564c8aee..95bc274c937 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -14,12 +14,12 @@ TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot,
 }
 
 
-TAO::SL3::SecurityCurrent::~SecurityCurrent (void)
+TAO::SL3::SecurityCurrent::~SecurityCurrent ()
 {
 }
 
 SecurityLevel3::ClientCredentials_ptr
-TAO::SL3::SecurityCurrent::client_credentials (void)
+TAO::SL3::SecurityCurrent::client_credentials ()
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
 
@@ -33,7 +33,7 @@ TAO::SL3::SecurityCurrent::client_credentials (void)
 }
 
 CORBA::Boolean
-TAO::SL3::SecurityCurrent::request_is_local (void)
+TAO::SL3::SecurityCurrent::request_is_local ()
 {
   TAO::SL3::SecurityCurrent_Impl * impl = this->implementation ();
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
index 2dfaeb1645f..e9518af55ba 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl (void)
+TAO::SL3::SecurityCurrent_Impl::~SecurityCurrent_Impl ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
index 4242a6fc6a8..cb8a06bff3f 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -45,7 +45,6 @@ namespace TAO
     class TAO_Security_Export SecurityCurrent_Impl
     {
     public:
-
       /// Destructor.
       virtual ~SecurityCurrent_Impl (void);
 
@@ -58,17 +57,14 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel3::ClientCredentials_ptr client_credentials ()
-        = 0;
+      virtual SecurityLevel3::ClientCredentials_ptr client_credentials () = 0;
 
       /// Is the current request local?
-      virtual CORBA::Boolean request_is_local ()
-        = 0;
+      virtual CORBA::Boolean request_is_local () = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.
       virtual CORBA::ULong tag (void) const = 0;
-
     };
 
   }  // End Security namespace.
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
index a0cc037bf31..9e1e1850e0a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -10,7 +10,7 @@ TAO::SL3::SecurityManager::SecurityManager (
 {
 }
 
-TAO::SL3::SecurityManager::~SecurityManager (void)
+TAO::SL3::SecurityManager::~SecurityManager ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
index 8ea7bb61737..2cde77f2465 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -16,7 +16,7 @@ TAO_Security_Current::TAO_Security_Current (size_t tss_slot,
 {
 }
 
-TAO_Security_Current::~TAO_Security_Current (void)
+TAO_Security_Current::~TAO_Security_Current ()
 {
 }
 
@@ -50,7 +50,7 @@ TAO_Security_Current::received_credentials ()
 }
 
 int
-TAO_Security_Current::init (void)
+TAO_Security_Current::init ()
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
index 0a6350f675f..75c6442c097 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -3,7 +3,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO::Security::Current_Impl::~Current_Impl (void)
+TAO::Security::Current_Impl::~Current_Impl ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
index aa1825c25ca..3931509fc0a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -59,8 +59,7 @@ namespace TAO
       /// the given attribute type list associated with the current
       /// request.
       virtual ::Security::AttributeList * get_attributes (
-          const ::Security::AttributeTypeList & attributes)
-        = 0;
+          const ::Security::AttributeTypeList & attributes) = 0;
       //@}
 
       /**
@@ -72,8 +71,7 @@ namespace TAO
       //@{
       /// Return the Credentials received from the client associate with
       /// the current request.
-      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ()
-        = 0;
+      virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () = 0;
       //@}
 
       /// Return the unique tag that identifies the concrete subclass.