summaryrefslogtreecommitdiff
path: root/TAO/tao/ZIOP
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/ZIOP')
-rw-r--r--TAO/tao/ZIOP/ZIOP.cpp6
-rw-r--r--TAO/tao/ZIOP/ZIOP.h8
-rw-r--r--TAO/tao/ZIOP/ZIOP_ORBInitializer.h1
-rw-r--r--TAO/tao/ZIOP/ZIOP_Policy_Validator.h1
-rw-r--r--TAO/tao/ZIOP/ZIOP_Policy_i.cpp36
-rw-r--r--TAO/tao/ZIOP/ZIOP_Policy_i.h39
-rw-r--r--TAO/tao/ZIOP/ZIOP_Stub.cpp12
-rw-r--r--TAO/tao/ZIOP/ZIOP_Stub.h14
-rw-r--r--TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp2
-rw-r--r--TAO/tao/ZIOP/ZIOP_Stub_Factory.h2
10 files changed, 55 insertions, 66 deletions
diff --git a/TAO/tao/ZIOP/ZIOP.cpp b/TAO/tao/ZIOP/ZIOP.cpp
index d1f84d8d256..d65e6f5d77a 100644
--- a/TAO/tao/ZIOP/ZIOP.cpp
+++ b/TAO/tao/ZIOP/ZIOP.cpp
@@ -10,12 +10,12 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-TAO_ZIOP_Loader::TAO_ZIOP_Loader (void)
+TAO_ZIOP_Loader::TAO_ZIOP_Loader ()
: initialized_ (false)
{
}
-TAO_ZIOP_Loader::~TAO_ZIOP_Loader (void)
+TAO_ZIOP_Loader::~TAO_ZIOP_Loader ()
{
}
@@ -93,7 +93,7 @@ TAO_ZIOP_Loader::load_policy_validators (TAO_Policy_Validator &val)
}
int
-TAO_ZIOP_Loader::Initializer (void)
+TAO_ZIOP_Loader::Initializer ()
{
return ACE_Service_Config::process_directive (ace_svc_desc_TAO_ZIOP_Loader);
}
diff --git a/TAO/tao/ZIOP/ZIOP.h b/TAO/tao/ZIOP/ZIOP.h
index 31d5078710e..64d4b66990b 100644
--- a/TAO/tao/ZIOP/ZIOP.h
+++ b/TAO/tao/ZIOP/ZIOP.h
@@ -39,12 +39,11 @@ class TAO_ServerRequest;
class TAO_ZIOP_Export TAO_ZIOP_Loader : public TAO_ZIOP_Adapter
{
public:
-
/// Constructor
- TAO_ZIOP_Loader (void);
+ TAO_ZIOP_Loader ();
/// Destructor
- virtual ~TAO_ZIOP_Loader (void);
+ virtual ~TAO_ZIOP_Loader ();
virtual bool decompress (ACE_Data_Block **db, TAO_Queued_Data &qd, TAO_ORB_Core &orb_core);
@@ -58,13 +57,12 @@ public:
virtual void load_policy_validators (TAO_Policy_Validator &validator);
/// Used to force the initialization of the ORB code.
- static int Initializer (void);
+ static int Initializer ();
/// Converts compressor ID to a compressor name.
static const char * ziop_compressorid_name (::Compression::CompressorId st);
private:
-
/// Set to true after init is called.
bool initialized_;
diff --git a/TAO/tao/ZIOP/ZIOP_ORBInitializer.h b/TAO/tao/ZIOP/ZIOP_ORBInitializer.h
index 87fcff4fbde..1f723f86404 100644
--- a/TAO/tao/ZIOP/ZIOP_ORBInitializer.h
+++ b/TAO/tao/ZIOP/ZIOP_ORBInitializer.h
@@ -58,7 +58,6 @@ public:
//@}
private:
-
/// Register policy factories.
void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info);
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_Validator.h b/TAO/tao/ZIOP/ZIOP_Policy_Validator.h
index 9cfab884e8d..fed6da7cd79 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_Validator.h
+++ b/TAO/tao/ZIOP/ZIOP_Policy_Validator.h
@@ -37,7 +37,6 @@ class TAO_ORB_Core;
class TAO_ZIOP_Export TAO_ZIOPPolicy_Validator : public TAO_Policy_Validator
{
public:
-
TAO_ZIOPPolicy_Validator (TAO_ORB_Core &orb_core);
virtual void validate_impl (TAO_Policy_Set &policies);
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
index 1c252dee3e9..7000776893c 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.cpp
@@ -18,7 +18,7 @@ CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (
{
}
-CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (void)
+CompressorIdLevelListPolicy::CompressorIdLevelListPolicy ()
: ::CORBA::Object ()
, ::CORBA::Policy ()
, ::ZIOP::CompressorIdLevelListPolicy ()
@@ -37,7 +37,7 @@ CompressorIdLevelListPolicy::CompressorIdLevelListPolicy (const CompressorIdLeve
}
CORBA::PolicyType
-CompressorIdLevelListPolicy::policy_type (void)
+CompressorIdLevelListPolicy::policy_type ()
{
// Future policy implementors: notice how this minimizes the
// footprint of the class.
@@ -56,7 +56,7 @@ CompressorIdLevelListPolicy::clone () const
}
CORBA::Policy_ptr
-CompressorIdLevelListPolicy::copy (void)
+CompressorIdLevelListPolicy::copy ()
{
CompressorIdLevelListPolicy* tmp = 0;
ACE_NEW_THROW_EX (tmp, CompressorIdLevelListPolicy (*this),
@@ -67,12 +67,12 @@ CompressorIdLevelListPolicy::copy (void)
}
void
-CompressorIdLevelListPolicy::destroy (void)
+CompressorIdLevelListPolicy::destroy ()
{
}
::Compression::CompressorIdLevelList *
-CompressorIdLevelListPolicy::compressor_ids (void)
+CompressorIdLevelListPolicy::compressor_ids ()
{
return &this->value_;
}
@@ -112,7 +112,7 @@ CompressionEnablingPolicy::CompressionEnablingPolicy (
{
}
-CompressionEnablingPolicy::CompressionEnablingPolicy (void)
+CompressionEnablingPolicy::CompressionEnablingPolicy ()
: ::CORBA::Object ()
, ::CORBA::Policy ()
, ::ZIOP::CompressionEnablingPolicy ()
@@ -131,7 +131,7 @@ CompressionEnablingPolicy::CompressionEnablingPolicy (const CompressionEnablingP
}
CORBA::PolicyType
-CompressionEnablingPolicy::policy_type (void)
+CompressionEnablingPolicy::policy_type ()
{
// Future policy implementors: notice how this minimizes the
// footprint of the class.
@@ -150,7 +150,7 @@ CompressionEnablingPolicy::clone () const
}
CORBA::Policy_ptr
-CompressionEnablingPolicy::copy (void)
+CompressionEnablingPolicy::copy ()
{
// Future policy implementors: notice how the following code is
// exception safe!
@@ -164,12 +164,12 @@ CompressionEnablingPolicy::copy (void)
}
void
-CompressionEnablingPolicy::destroy (void)
+CompressionEnablingPolicy::destroy ()
{
}
::CORBA::Boolean
-CompressionEnablingPolicy::compression_enabled (void)
+CompressionEnablingPolicy::compression_enabled ()
{
return this->value_;
}
@@ -220,7 +220,7 @@ CompressionLowValuePolicy::CompressionLowValuePolicy (const CompressionLowValueP
}
CORBA::PolicyType
-CompressionLowValuePolicy::policy_type (void)
+CompressionLowValuePolicy::policy_type ()
{
// Future policy implementors: notice how this minimizes the
// footprint of the class.
@@ -239,7 +239,7 @@ CompressionLowValuePolicy::clone () const
}
CORBA::Policy_ptr
-CompressionLowValuePolicy::copy (void)
+CompressionLowValuePolicy::copy ()
{
// Future policy implementors: notice how the following code is
// exception safe!
@@ -253,12 +253,12 @@ CompressionLowValuePolicy::copy (void)
}
void
-CompressionLowValuePolicy::destroy (void)
+CompressionLowValuePolicy::destroy ()
{
}
::CORBA::ULong
-CompressionLowValuePolicy::low_value (void)
+CompressionLowValuePolicy::low_value ()
{
return this->value_;
}
@@ -290,7 +290,7 @@ CompressionMinRatioPolicy::CompressionMinRatioPolicy (const CompressionMinRatioP
}
CORBA::PolicyType
-CompressionMinRatioPolicy::policy_type (void)
+CompressionMinRatioPolicy::policy_type ()
{
// Future policy implementors: notice how this minimizes the
// footprint of the class.
@@ -309,7 +309,7 @@ CompressionMinRatioPolicy::clone () const
}
CORBA::Policy_ptr
-CompressionMinRatioPolicy::copy (void)
+CompressionMinRatioPolicy::copy ()
{
// Future policy implementors: notice how the following code is
// exception safe!
@@ -323,12 +323,12 @@ CompressionMinRatioPolicy::copy (void)
}
void
-CompressionMinRatioPolicy::destroy (void)
+CompressionMinRatioPolicy::destroy ()
{
}
::Compression::CompressionRatio
-CompressionMinRatioPolicy::ratio (void)
+CompressionMinRatioPolicy::ratio ()
{
return this->value_;
}
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_i.h b/TAO/tao/ZIOP/ZIOP_Policy_i.h
index 433926cf9c9..fb7be623b81 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_i.h
+++ b/TAO/tao/ZIOP/ZIOP_Policy_i.h
@@ -39,7 +39,7 @@ class CompressorIdLevelListPolicy
, public virtual ::CORBA::LocalObject
{
public:
- CompressorIdLevelListPolicy (void);
+ CompressorIdLevelListPolicy ();
/// Constructor.
CompressorIdLevelListPolicy (const ::Compression::CompressorIdLevelList& val);
@@ -52,11 +52,11 @@ public:
virtual ::Compression::CompressorIdLevelList * compressor_ids ();
- virtual CORBA::PolicyType policy_type (void);
+ virtual CORBA::PolicyType policy_type ();
- virtual CORBA::Policy_ptr copy (void);
+ virtual CORBA::Policy_ptr copy ();
- virtual void destroy (void);
+ virtual void destroy ();
virtual TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -84,7 +84,7 @@ class CompressionEnablingPolicy
, public virtual ::CORBA::LocalObject
{
public:
- CompressionEnablingPolicy (void);
+ CompressionEnablingPolicy ();
/// Constructor.
CompressionEnablingPolicy (const ::CORBA::Boolean val);
@@ -96,13 +96,13 @@ public:
virtual CompressionEnablingPolicy *clone () const;
/// = The ZIOP::BidirectionalPolicy methods
- virtual ::CORBA::Boolean compression_enabled (void);
+ virtual ::CORBA::Boolean compression_enabled ();
- virtual CORBA::PolicyType policy_type (void);
+ virtual CORBA::PolicyType policy_type ();
- virtual CORBA::Policy_ptr copy (void);
+ virtual CORBA::Policy_ptr copy ();
- virtual void destroy (void);
+ virtual void destroy ();
virtual TAO_Cached_Policy_Type _tao_cached_type () const;
@@ -116,7 +116,6 @@ public:
CORBA::Boolean _tao_decode (TAO_InputCDR &in_cdr);
private:
-
/// The attribute
::CORBA::Boolean value_;
};
@@ -131,7 +130,6 @@ class CompressionLowValuePolicy
, public virtual ::CORBA::LocalObject
{
public:
-
/// Constructor.
CompressionLowValuePolicy (const ::CORBA::ULong val);
@@ -142,18 +140,17 @@ public:
virtual CompressionLowValuePolicy *clone () const;
/// = The ZIOP::BidirectionalPolicy methods
- virtual ::CORBA::ULong low_value (void);
+ virtual ::CORBA::ULong low_value ();
- virtual CORBA::PolicyType policy_type (void);
+ virtual CORBA::PolicyType policy_type ();
- virtual CORBA::Policy_ptr copy (void);
+ virtual CORBA::Policy_ptr copy ();
- virtual void destroy (void);
+ virtual void destroy ();
virtual TAO_Cached_Policy_Type _tao_cached_type () const;
private:
-
/// The attribute
::CORBA::ULong value_;
};
@@ -168,7 +165,6 @@ class CompressionMinRatioPolicy
, public virtual ::CORBA::LocalObject
{
public:
-
/// Constructor.
CompressionMinRatioPolicy (const ::Compression::CompressionRatio val);
@@ -178,18 +174,17 @@ public:
/// Returns a copy of this CompressionMinRatioPolicy.
virtual CompressionMinRatioPolicy *clone () const;
- virtual ::Compression::CompressionRatio ratio (void);
+ virtual ::Compression::CompressionRatio ratio ();
- virtual CORBA::PolicyType policy_type (void);
+ virtual CORBA::PolicyType policy_type ();
- virtual CORBA::Policy_ptr copy (void);
+ virtual CORBA::Policy_ptr copy ();
- virtual void destroy (void);
+ virtual void destroy ();
virtual TAO_Cached_Policy_Type _tao_cached_type () const;
private:
-
/// The attribute
::Compression::CompressionRatio value_;
};
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.cpp b/TAO/tao/ZIOP/ZIOP_Stub.cpp
index 9bc84af9845..a0d819ae2e8 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub.cpp
@@ -21,7 +21,7 @@ TAO_ZIOP_Stub::TAO_ZIOP_Stub (const char *repository_id,
{
}
-TAO_ZIOP_Stub::~TAO_ZIOP_Stub (void)
+TAO_ZIOP_Stub::~TAO_ZIOP_Stub ()
{
if (!CORBA::is_nil (this->compression_enabling_policy_.in ()))
this->compression_enabling_policy_->destroy ();
@@ -31,7 +31,7 @@ TAO_ZIOP_Stub::~TAO_ZIOP_Stub (void)
}
void
-TAO_ZIOP_Stub::parse_policies (void)
+TAO_ZIOP_Stub::parse_policies ()
{
CORBA::PolicyList_var policy_list
= this->base_profiles_.policy_list ();
@@ -61,7 +61,7 @@ TAO_ZIOP_Stub::parse_policies (void)
}
CORBA::Policy *
-TAO_ZIOP_Stub::exposed_compression_id_list_policy (void)
+TAO_ZIOP_Stub::exposed_compression_id_list_policy ()
{
if (!this->are_policies_parsed_)
{
@@ -78,7 +78,7 @@ TAO_ZIOP_Stub::exposed_compression_id_list_policy (CORBA::Policy_ptr policy)
}
CORBA::Policy *
-TAO_ZIOP_Stub::exposed_compression_enabling_policy (void)
+TAO_ZIOP_Stub::exposed_compression_enabling_policy ()
{
if (!this->are_policies_parsed_)
{
@@ -137,7 +137,7 @@ TAO_ZIOP_Stub::get_cached_policy (TAO_Cached_Policy_Type type)
}
CORBA::Policy *
-TAO_ZIOP_Stub::effective_compression_enabling_policy (void)
+TAO_ZIOP_Stub::effective_compression_enabling_policy ()
{
// Get effective override.
CORBA::Policy_var override =
@@ -172,7 +172,7 @@ TAO_ZIOP_Stub::effective_compression_enabling_policy (void)
}
CORBA::Policy *
-TAO_ZIOP_Stub::effective_compression_id_list_policy (void)
+TAO_ZIOP_Stub::effective_compression_id_list_policy ()
{
// Get effective override (This is the CLIENTS compressor's priority ordered list).
CORBA::Policy_var policy (
diff --git a/TAO/tao/ZIOP/ZIOP_Stub.h b/TAO/tao/ZIOP/ZIOP_Stub.h
index 97c454197f8..51ce9fc5bd8 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub.h
+++ b/TAO/tao/ZIOP/ZIOP_Stub.h
@@ -45,12 +45,11 @@ namespace TAO
class TAO_ZIOP_Export TAO_ZIOP_Stub : public TAO_Stub
{
public:
-
TAO_ZIOP_Stub (const char *repository_id,
const TAO_MProfile &profiles,
TAO_ORB_Core *orb_core);
- virtual ~TAO_ZIOP_Stub (void);
+ virtual ~TAO_ZIOP_Stub ();
/**
* Returns the effective policy if @a type is a known client-exposed
@@ -62,20 +61,19 @@ public:
CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type);
private:
-
/// Helper method used to parse the policies.
- void parse_policies (void);
+ void parse_policies ();
void exposed_compression_enabling_policy (CORBA::Policy_ptr policy);
void exposed_compression_id_list_policy (CORBA::Policy_ptr policy);
- CORBA::Policy_ptr exposed_compression_enabling_policy (void);
+ CORBA::Policy_ptr exposed_compression_enabling_policy ();
- CORBA::Policy_ptr exposed_compression_id_list_policy (void);
+ CORBA::Policy_ptr exposed_compression_id_list_policy ();
- CORBA::Policy *effective_compression_enabling_policy (void);
- CORBA::Policy *effective_compression_id_list_policy (void);
+ CORBA::Policy *effective_compression_enabling_policy ();
+ CORBA::Policy *effective_compression_id_list_policy ();
// The following attribute are used to cache
// the different kind of policies and avoid to
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
index a9fe731afdf..23ca0b113ab 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.cpp
@@ -11,7 +11,7 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory (void)
+TAO_ZIOP_Stub_Factory::~TAO_ZIOP_Stub_Factory ()
{
}
diff --git a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
index 0726fbf5dfb..e0a7b4be0f2 100644
--- a/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
+++ b/TAO/tao/ZIOP/ZIOP_Stub_Factory.h
@@ -45,7 +45,7 @@ class TAO_ZIOP_Export TAO_ZIOP_Stub_Factory : public TAO_Stub_Factory
{
public:
// -- Ctor/Dtor --
- virtual ~TAO_ZIOP_Stub_Factory (void);
+ virtual ~TAO_ZIOP_Stub_Factory ();
/// Creates a Stub Object.
virtual TAO_Stub *create_stub (const char *repository_id,
View Lorry Controller Status