summaryrefslogtreecommitdiff
path: root/TAO/tao/IORTable
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/IORTable')
-rw-r--r--TAO/tao/IORTable/Async_IORTable.cpp2
-rw-r--r--TAO/tao/IORTable/Async_IORTable.h2
-rw-r--r--TAO/tao/IORTable/Async_IOR_Table_Impl.cpp4
-rw-r--r--TAO/tao/IORTable/Async_IOR_Table_Impl.h6
-rw-r--r--TAO/tao/IORTable/Async_Table_Adapter.cpp6
-rw-r--r--TAO/tao/IORTable/Async_Table_Adapter.h6
-rw-r--r--TAO/tao/IORTable/IORTable.cpp2
-rw-r--r--TAO/tao/IORTable/IORTable.h2
-rw-r--r--TAO/tao/IORTable/IOR_Table_Impl.cpp4
-rw-r--r--TAO/tao/IORTable/IOR_Table_Impl.h2
-rw-r--r--TAO/tao/IORTable/Locate_ResponseHandler.cpp2
-rw-r--r--TAO/tao/IORTable/Locate_ResponseHandler.h13
-rw-r--r--TAO/tao/IORTable/Locate_ResponseHandler.inl10
-rw-r--r--TAO/tao/IORTable/Table_Adapter.cpp9
-rw-r--r--TAO/tao/IORTable/Table_Adapter.h9
15 files changed, 38 insertions, 41 deletions
diff --git a/TAO/tao/IORTable/Async_IORTable.cpp b/TAO/tao/IORTable/Async_IORTable.cpp
index 762d66d249d..181480efeea 100644
--- a/TAO/tao/IORTable/Async_IORTable.cpp
+++ b/TAO/tao/IORTable/Async_IORTable.cpp
@@ -14,7 +14,7 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
int
-TAO_Async_IORTable_Initializer::init (void)
+TAO_Async_IORTable_Initializer::init ()
{
return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Async_Table_Adapter_Factory);
}
diff --git a/TAO/tao/IORTable/Async_IORTable.h b/TAO/tao/IORTable/Async_IORTable.h
index 8cb08364839..6eeebf99c42 100644
--- a/TAO/tao/IORTable/Async_IORTable.h
+++ b/TAO/tao/IORTable/Async_IORTable.h
@@ -29,7 +29,7 @@ class TAO_Async_IORTable_Export TAO_Async_IORTable_Initializer
{
public:
/// Used to force the initialization of the ORB code.
- static int init (void);
+ static int init ();
};
static int
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
index d467760a738..e343a903b12 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.cpp
@@ -11,11 +11,11 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl (void)
+TAO_Async_IOR_Table_Impl::TAO_Async_IOR_Table_Impl ()
{
}
-TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl (void)
+TAO_Async_IOR_Table_Impl::~TAO_Async_IOR_Table_Impl ()
{
}
diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
index 956e24ef602..e5ce2e137a6 100644
--- a/TAO/tao/IORTable/Async_IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h
@@ -38,10 +38,10 @@ class TAO_Async_IOR_Table_Impl : public virtual TAO_IOR_Table_Impl
{
public:
/// Constructor
- TAO_Async_IOR_Table_Impl (void);
- virtual ~TAO_Async_IOR_Table_Impl (void);
+ TAO_Async_IOR_Table_Impl ();
+ virtual ~TAO_Async_IOR_Table_Impl ();
- virtual bool async_available (void) { return true; }
+ virtual bool async_available () { return true; }
virtual void async_find (::IORTable::Locate_ResponseHandler rh,
const char *object_key);
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.cpp b/TAO/tao/IORTable/Async_Table_Adapter.cpp
index 92ae3ea2a87..7fb88ec03a5 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Async_Table_Adapter.cpp
@@ -23,12 +23,12 @@ TAO_Async_Table_Adapter::TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core)
{
}
-TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter (void)
+TAO_Async_Table_Adapter::~TAO_Async_Table_Adapter ()
{
}
void
-TAO_Async_Table_Adapter::open (void)
+TAO_Async_Table_Adapter::open ()
{
ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
TAO_Async_IOR_Table_Impl *impl = 0;
@@ -99,7 +99,7 @@ TAO_Async_Table_Adapter::find_object (IORTable::Locate_ResponseHandler rh,
// ****************************************************************
-TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory (void)
+TAO_Async_Table_Adapter_Factory::TAO_Async_Table_Adapter_Factory ()
{
}
diff --git a/TAO/tao/IORTable/Async_Table_Adapter.h b/TAO/tao/IORTable/Async_Table_Adapter.h
index 330445362d1..8c6a558e9b3 100644
--- a/TAO/tao/IORTable/Async_Table_Adapter.h
+++ b/TAO/tao/IORTable/Async_Table_Adapter.h
@@ -32,11 +32,11 @@ public:
TAO_Async_Table_Adapter (TAO_ORB_Core &orb_core);
/// Destructor
- virtual ~TAO_Async_Table_Adapter (void);
+ virtual ~TAO_Async_Table_Adapter ();
// = The TAO_Adapter methods, please check tao/Adapter.h for the
// documentation
- virtual void open (void);
+ virtual void open ();
virtual int dispatch (TAO::ObjectKey &key,
TAO_ServerRequest &request,
@@ -55,7 +55,7 @@ class TAO_Async_IORTable_Export TAO_Async_Table_Adapter_Factory :
{
public:
/// Constructor
- TAO_Async_Table_Adapter_Factory (void);
+ TAO_Async_Table_Adapter_Factory ();
/// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
/// details.
diff --git a/TAO/tao/IORTable/IORTable.cpp b/TAO/tao/IORTable/IORTable.cpp
index ae5d20342cb..d4c63ec8ebc 100644
--- a/TAO/tao/IORTable/IORTable.cpp
+++ b/TAO/tao/IORTable/IORTable.cpp
@@ -14,7 +14,7 @@
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
int
-TAO_IORTable_Initializer::init (void)
+TAO_IORTable_Initializer::init ()
{
return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Table_Adapter_Factory);
}
diff --git a/TAO/tao/IORTable/IORTable.h b/TAO/tao/IORTable/IORTable.h
index edc17a37cf4..1dccde36fe6 100644
--- a/TAO/tao/IORTable/IORTable.h
+++ b/TAO/tao/IORTable/IORTable.h
@@ -29,7 +29,7 @@ class TAO_IORTable_Export TAO_IORTable_Initializer
{
public:
/// Used to force the initialization of the ORB code.
- static int init (void);
+ static int init ();
};
static int
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index a30cb93701e..8137e5d1eb7 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -28,7 +28,7 @@ TAO::Objref_Traits <TAO_IOR_Table_Impl>::release (TAO_IOR_Table_Impl_ptr p)
}
TAO_IOR_Table_Impl_ptr
-TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil (void)
+TAO::Objref_Traits <TAO_IOR_Table_Impl>::nil ()
{
return TAO_IOR_Table_Impl::_nil ();
}
@@ -40,7 +40,7 @@ TAO::Objref_Traits <TAO_IOR_Table_Impl>::marshal (const TAO_IOR_Table_Impl_ptr,
return false;
}
-TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
+TAO_IOR_Table_Impl::TAO_IOR_Table_Impl ()
{
}
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index be602fb44f6..01f1d36cb74 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -98,7 +98,7 @@ namespace TAO
static void release (TAO_IOR_Table_Impl_ptr);
- static TAO_IOR_Table_Impl_ptr nil (void);
+ static TAO_IOR_Table_Impl_ptr nil ();
static ::CORBA::Boolean marshal (const TAO_IOR_Table_Impl_ptr p,
TAO_OutputCDR &cdr);
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.cpp b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
index b2a8384ff51..021233b2b9f 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.cpp
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.cpp
@@ -38,7 +38,7 @@ TAO_AMH_Locate_ResponseHandler::TAO_AMH_Locate_ResponseHandler (
this->init (sr,0);
}
-TAO_AMH_Locate_ResponseHandler::~TAO_AMH_Locate_ResponseHandler (void)
+TAO_AMH_Locate_ResponseHandler::~TAO_AMH_Locate_ResponseHandler ()
{
}
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.h b/TAO/tao/IORTable/Locate_ResponseHandler.h
index f07c884b168..34456416143 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.h
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.h
@@ -48,11 +48,11 @@ typedef TAO_AMH_Locate_ResponseHandler *TAO_AMH_Locate_ResponseHandler_ptr;
class TAO_Async_IORTable_Export TAO_AMH_Locate_ResponseHandler_var
{
public:
- TAO_AMH_Locate_ResponseHandler_var (void);
+ TAO_AMH_Locate_ResponseHandler_var ();
TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_Locate_ResponseHandler_ptr);
TAO_AMH_Locate_ResponseHandler_var (
const TAO_AMH_Locate_ResponseHandler_var &);
- ~TAO_AMH_Locate_ResponseHandler_var (void);
+ ~TAO_AMH_Locate_ResponseHandler_var ();
TAO_AMH_Locate_ResponseHandler_var &operator= (
TAO_AMH_Locate_ResponseHandler_ptr);
@@ -64,9 +64,9 @@ public:
operator TAO_AMH_Locate_ResponseHandler_ptr &();
TAO_AMH_Locate_ResponseHandler_ptr in () const;
- TAO_AMH_Locate_ResponseHandler_ptr &inout (void);
- TAO_AMH_Locate_ResponseHandler_ptr &out (void);
- TAO_AMH_Locate_ResponseHandler_ptr _retn (void);
+ TAO_AMH_Locate_ResponseHandler_ptr &inout ();
+ TAO_AMH_Locate_ResponseHandler_ptr &out ();
+ TAO_AMH_Locate_ResponseHandler_ptr _retn ();
TAO_AMH_Locate_ResponseHandler_ptr ptr () const;
private:
@@ -102,7 +102,7 @@ public:
typedef TAO_AMH_Locate_ResponseHandler_var _var_type;
TAO_AMH_Locate_ResponseHandler (TAO_ServerRequest &sr);
- ~TAO_AMH_Locate_ResponseHandler (void);
+ ~TAO_AMH_Locate_ResponseHandler ();
virtual void raise_excep (const CORBA::Exception &ex);
@@ -134,7 +134,6 @@ namespace IORTable
{
// satisfy the native type requirement for the asnyc locate interface
typedef const TAO_AMH_Locate_ResponseHandler_var &Locate_ResponseHandler;
-
}
TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl
index 0049174c13a..129c89310ba 100644
--- a/TAO/tao/IORTable/Locate_ResponseHandler.inl
+++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl
@@ -15,7 +15,7 @@ TAO_AMH_Locate_ResponseHandler::_duplicate (TAO_AMH_Locate_ResponseHandler_ptr x
// Inline operations for class TAO_AMH_Locate_ResponseHandler_var
ACE_INLINE
-TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (void)
+TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var ()
: ptr_ (TAO_AMH_Locate_ResponseHandler::_nil ())
{
}
@@ -26,7 +26,7 @@ TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_
{}
ACE_INLINE
-TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var (void)
+TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var ()
{
CORBA::release(ptr_);
}
@@ -86,13 +86,13 @@ TAO_AMH_Locate_ResponseHandler_var::in () const
}
ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr &
-TAO_AMH_Locate_ResponseHandler_var::inout (void)
+TAO_AMH_Locate_ResponseHandler_var::inout ()
{
return this->ptr_;
}
ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr &
-TAO_AMH_Locate_ResponseHandler_var::out (void)
+TAO_AMH_Locate_ResponseHandler_var::out ()
{
CORBA::release (this->ptr_);
this->ptr_ = TAO_AMH_Locate_ResponseHandler::_nil ();
@@ -100,7 +100,7 @@ TAO_AMH_Locate_ResponseHandler_var::out (void)
}
ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr
-TAO_AMH_Locate_ResponseHandler_var::_retn (void)
+TAO_AMH_Locate_ResponseHandler_var::_retn ()
{
// yield ownership
TAO_AMH_Locate_ResponseHandler_ptr val = this->ptr_;
diff --git a/TAO/tao/IORTable/Table_Adapter.cpp b/TAO/tao/IORTable/Table_Adapter.cpp
index f6240e35da4..60d8c629706 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -26,7 +26,7 @@ TAO_Table_Adapter::TAO_Table_Adapter (TAO_ORB_Core &orb_core)
{
}
-TAO_Table_Adapter::~TAO_Table_Adapter (void)
+TAO_Table_Adapter::~TAO_Table_Adapter ()
{
delete this->lock_;
}
@@ -43,7 +43,7 @@ TAO_Table_Adapter::create_lock (TAO_SYNCH_MUTEX &thread_lock)
}
void
-TAO_Table_Adapter::open (void)
+TAO_Table_Adapter::open ()
{
ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
TAO_IOR_Table_Impl *impl = 0;
@@ -95,7 +95,7 @@ TAO_Table_Adapter::name () const
}
CORBA::Object_ptr
-TAO_Table_Adapter::root (void)
+TAO_Table_Adapter::root ()
{
return CORBA::Object::_duplicate (this->root_.in());
}
@@ -117,7 +117,6 @@ TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
stub->is_collocated (),
stub->collocated_servant ()),
CORBA::Object::_nil ());
-
}
return result;
@@ -190,7 +189,7 @@ TAO_Table_Adapter::find_object (TAO::ObjectKey &key,
// ****************************************************************
-TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void)
+TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory ()
{
}
diff --git a/TAO/tao/IORTable/Table_Adapter.h b/TAO/tao/IORTable/Table_Adapter.h
index 6b0e775a3b3..071709e8a88 100644
--- a/TAO/tao/IORTable/Table_Adapter.h
+++ b/TAO/tao/IORTable/Table_Adapter.h
@@ -32,16 +32,15 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
class TAO_IORTable_Export TAO_Table_Adapter : public TAO_Adapter
{
public:
-
/// Constructor
TAO_Table_Adapter (TAO_ORB_Core &orb_core);
/// Destructor
- virtual ~TAO_Table_Adapter (void);
+ virtual ~TAO_Table_Adapter ();
// = The TAO_Adapter methods, please check tao/Adapter.h for the
// documentation
- virtual void open (void);
+ virtual void open ();
virtual void close (int wait_for_completion);
virtual void check_close (int wait_for_completion);
virtual int priority () const;
@@ -50,7 +49,7 @@ public:
CORBA::Object_out foward_to);
virtual const char *name () const;
- virtual CORBA::Object_ptr root (void);
+ virtual CORBA::Object_ptr root ();
virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
const TAO_MProfile &);
@@ -80,7 +79,7 @@ class TAO_IORTable_Export TAO_Table_Adapter_Factory : public TAO_Adapter_Factory
{
public:
/// Constructor
- TAO_Table_Adapter_Factory (void);
+ TAO_Table_Adapter_Factory ();
/// The TAO_Adapter_Factory methods, please read tao/Adapter.h for
/// details.
View Lorry Controller Status