summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/examples/Reactor/Proactor/test_proactor2.cpp2
-rw-r--r--TAO/examples/OBV/Simple_util.cpp2
-rw-r--r--TAO/examples/OBV/Simple_util.h2
-rw-r--r--TAO/examples/Persistent_Grid/Simple_util.h2
-rw-r--r--TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h6
-rw-r--r--TAO/tao/DynamicInterface/Request.inl2
-rw-r--r--TAO/tests/AMI_Timeouts/client.cpp1
-rw-r--r--TAO/tests/AMI_Timeouts/timeout.idl3
-rw-r--r--TAO/tests/AMI_Timeouts/timeout_client.h12
-rw-r--r--TAO/tests/AMI_Timeouts/timeout_i.cpp10
-rw-r--r--TAO/tests/AMI_Timeouts/timeout_i.h8
-rw-r--r--TAO/tests/DIOP/UDP_Client_i.h2
-rw-r--r--TAO/tests/OBV/Simple/Simple_util.cpp2
-rw-r--r--TAO/tests/OBV/Simple/Simple_util.h2
15 files changed, 17 insertions, 41 deletions
diff --git a/ACE/examples/Reactor/Proactor/test_proactor2.cpp b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
index d4ed31bf263..ef04b9c02ab 100644
--- a/ACE/examples/Reactor/Proactor/test_proactor2.cpp
+++ b/ACE/examples/Reactor/Proactor/test_proactor2.cpp
@@ -89,7 +89,7 @@ public:
};
-int MyTask::svc (void )
+int MyTask::svc ()
{
ACE_DEBUG ((LM_DEBUG, "(%t) MyTask started\n"));
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 35b1ec5c4a0..8c2475d30d2 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -281,7 +281,7 @@ Client<InterfaceObj, Var>::obtain_initial_references (void)
}
template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void )
+Client<InterfaceObj, Var>::shutdown ()
{
// Returns the shutdwon flag
return shutdown_;
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index d334ff1f7d8..856ed38c13b 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -106,7 +106,7 @@ public:
InterfaceObj *operator-> () { return server_.in ();};
/// Returns the shutdown flag.
- int shutdown (void );
+ int shutdown ();
/// Fills in the shutdwon flag.
void shutdown (int);
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index 4742ba66d37..2a3c7473825 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -108,7 +108,7 @@ public:
InterfaceObj *operator-> () { return server_.in ();};
/// Returns the shutdown flag.
- int shutdown (void );
+ int shutdown ();
/// Fills in the shutdwon flag.
void shutdown (int);
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
index 1f138762c75..5a13402ce67 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.h
@@ -41,7 +41,7 @@ public:
private:
// Runs in a separate thread.
- virtual int svc (void );
+ virtual int svc ();
private:
CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
index d27ce41225c..6bf7d63ff8a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h
@@ -81,10 +81,10 @@ public:
void send_objgrp_update (PortableGroup::ObjectGroupId id,
FT_Naming::ChangeType update);
- void init_orb (void);
+ void init_orb ();
- bool init_peer (void );
- bool peer_init_i (void );
+ bool init_peer ();
+ bool peer_init_i ();
void send_registration (bool use_combo);
bool update_peer_registration ();
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index ea1b7f79204..cce99f9dd0d 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -103,7 +103,7 @@ CORBA::Request::set_return_type (CORBA::TypeCode_ptr tc)
}
ACE_INLINE CORBA::Any &
-CORBA::Request::return_value (void )
+CORBA::Request::return_value ()
{
return this->result_->any_;
}
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index e8f09f22673..9b69161caab 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -9,7 +9,6 @@
*/
//=============================================================================
-
#include "timeout_client.h"
#include "tao/debug.h"
diff --git a/TAO/tests/AMI_Timeouts/timeout.idl b/TAO/tests/AMI_Timeouts/timeout.idl
index b87f26ad878..28f63aeae48 100644
--- a/TAO/tests/AMI_Timeouts/timeout.idl
+++ b/TAO/tests/AMI_Timeouts/timeout.idl
@@ -1,4 +1,3 @@
-
//=============================================================================
/**
* @file timeout.idl
@@ -10,8 +9,6 @@
*/
//=============================================================================
-
-
interface TimeoutObj {
void sendTimeToWait (in long msec);
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.h b/TAO/tests/AMI_Timeouts/timeout_client.h
index 9ef578cbbd5..eea4333abc1 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.h
+++ b/TAO/tests/AMI_Timeouts/timeout_client.h
@@ -1,4 +1,3 @@
-
//=============================================================================
/**
* @file timeout_client.h
@@ -9,14 +8,10 @@
*/
//=============================================================================
-
-
#include "ace/Task.h"
-
#include "timeout_i.h"
-class TimeoutClient
-: public ACE_Task_Base
+class TimeoutClient : public ACE_Task_Base
{
public:
TimeoutClient (CORBA::ORB_ptr orb,
@@ -27,13 +22,12 @@ public:
~TimeoutClient ();
-
private:
// Initialize the context of this class.
int initialize ();
// Run in a separate thread.
- virtual int svc (void );
+ virtual int svc ();
// Wrapps complex invocations logic.
void send (CORBA::Boolean async,
@@ -46,7 +40,7 @@ private:
// Test the accuracy of the timeouts.
int accuracy_test ();
- // Test if the timeout functionaltiy disturbs non-timeout invocations
+ // Test if the timeout functionality disturbs non-timeout invocations
int none_test ();
private:
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index e497ca6eaa3..0a77ef98bc8 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp
@@ -1,4 +1,3 @@
-
//=============================================================================
/**
* @file timeout_i.cpp
@@ -9,7 +8,6 @@
*/
//=============================================================================
-
#include "timeout_i.h"
#include "ace/OS_NS_unistd.h"
@@ -18,10 +16,6 @@ Timeout_i::Timeout_i (CORBA::ORB_ptr orb)
orb_ = CORBA::ORB::_duplicate (orb);
}
-Timeout_i::~Timeout_i ()
-{
-}
-
void
Timeout_i::sendTimeToWait (CORBA::Long msec)
{
@@ -58,10 +52,6 @@ TimeoutHandler_i::TimeoutHandler_i ()
timer_.stop ();
}
-TimeoutHandler_i::~TimeoutHandler_i ()
-{
-}
-
void
TimeoutHandler_i::sendTimeToWait (void)
{
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h
index de8803326e0..b5da504a2ed 100644
--- a/TAO/tests/AMI_Timeouts/timeout_i.h
+++ b/TAO/tests/AMI_Timeouts/timeout_i.h
@@ -1,4 +1,3 @@
-
//=============================================================================
/**
* @file timeout_i.h
@@ -9,12 +8,10 @@
*/
//=============================================================================
-
#ifndef TIMEOUT_I_H
#define TIMEOUT_I_H
#include "ace/High_Res_Timer.h"
-
#include "timeoutS.h"
class Timeout_i
@@ -23,14 +20,13 @@ class Timeout_i
public:
Timeout_i (CORBA::ORB_ptr orb);
- ~Timeout_i ();
+ ~Timeout_i () = default;
virtual void sendTimeToWait (CORBA::Long msec);
virtual void shutdown (void);
private:
-
CORBA::ORB_var orb_;
};
@@ -40,7 +36,7 @@ class TimeoutHandler_i
public:
TimeoutHandler_i ();
- ~TimeoutHandler_i ();
+ ~TimeoutHandler_i () = default;
virtual void sendTimeToWait (void);
diff --git a/TAO/tests/DIOP/UDP_Client_i.h b/TAO/tests/DIOP/UDP_Client_i.h
index 0dbc343c570..f7c8261fc7c 100644
--- a/TAO/tests/DIOP/UDP_Client_i.h
+++ b/TAO/tests/DIOP/UDP_Client_i.h
@@ -41,7 +41,7 @@ public:
private:
// Runs in a separate thread.
- virtual int svc (void );
+ virtual int svc ();
private:
CORBA::ORB_var orb_;
diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp
index 118db532d9a..8d9a697ed1e 100644
--- a/TAO/tests/OBV/Simple/Simple_util.cpp
+++ b/TAO/tests/OBV/Simple/Simple_util.cpp
@@ -282,7 +282,7 @@ Client<InterfaceObj, Var>::obtain_initial_references (void)
}
template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void )
+Client<InterfaceObj, Var>::shutdown ()
{
// Returns the shutdwon flag
return shutdown_;
diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h
index 80ccbf452fc..6087bf3bd9d 100644
--- a/TAO/tests/OBV/Simple/Simple_util.h
+++ b/TAO/tests/OBV/Simple/Simple_util.h
@@ -103,7 +103,7 @@ public:
InterfaceObj *operator-> () { return server_.in ();};
/// Returns the shutdown flag.
- int shutdown (void );
+ int shutdown ();
/// Fills in the shutdwon flag.
void shutdown (int);
View Lorry Controller Status