From d9ca0f4e0b3219f6197d6b8e6f6cbb2e52bd57be Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 17 Nov 2023 09:01:59 +0100 Subject: [PATCH 1/2] Removed redundant void * connectors/ami4ccm/tutorials/hello/tutorial/src/tutorials/hello/ami4ccm_tutorial.adoc: * connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp: * connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.h: * connectors/psdd4ccm/tests/latency/components/receiver/latency_receiver_exec.h: * connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp: * connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.h: * ddsx11/tests/latency/sender/main.cpp: * ddsx11/tests/minimal_latency/sender/main.cpp: --- .../src/tutorials/hello/ami4ccm_tutorial.adoc | 2 +- .../components/sender/latency_sender_exec.cpp | 2 +- .../components/sender/latency_sender_exec.h | 10 +++++----- .../components/receiver/latency_receiver_exec.h | 2 +- .../components/sender/latency_sender_exec.cpp | 4 ++-- .../components/sender/latency_sender_exec.h | 10 +++++----- ddsx11/tests/latency/sender/main.cpp | 14 +++++++------- ddsx11/tests/minimal_latency/sender/main.cpp | 14 +++++++------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/connectors/ami4ccm/tutorials/hello/tutorial/src/tutorials/hello/ami4ccm_tutorial.adoc b/connectors/ami4ccm/tutorials/hello/tutorial/src/tutorials/hello/ami4ccm_tutorial.adoc index 81a8a0229..ec1707ced 100644 --- a/connectors/ami4ccm/tutorials/hello/tutorial/src/tutorials/hello/ami4ccm_tutorial.adoc +++ b/connectors/ami4ccm/tutorials/hello/tutorial/src/tutorials/hello/ami4ccm_tutorial.adoc @@ -715,7 +715,7 @@ sender. [source,c++] -------------------------------------------------------------------- IDL::traits::ref_type - Receiver_exec_i::get_do_my_foo (void) + Receiver_exec_i::get_do_my_foo () {  return CORBA::make_reference (this->context_); } -------------------------------------------------------------------- diff --git a/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp b/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp index 93e6ee6f2..62053ab81 100644 --- a/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp +++ b/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp @@ -480,7 +480,7 @@ namespace Test_Sender_Impl } void - Sender_exec_i::calc_results (void) + Sender_exec_i::calc_results () { if (this->iteration_nr_ == 0) return; // ignore first iteration diff --git a/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.h b/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.h index 0153343b3..f7e7826d4 100644 --- a/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.h +++ b/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.h @@ -385,11 +385,11 @@ namespace Test_Sender_Impl /** @name User defined private operations. */ //@{ //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test_Sender_Impl::Sender_exec_i[user_private_ops] - void start (void); - void calc_results (void); - void reset_results (void); - void init_values (void); - void calculate_clock_overhead (void); + void start (); + void calc_results (); + void reset_results (); + void init_values (); + void calculate_clock_overhead (); void record_time (uint64_t receive_time); //@@{__RIDL_REGEN_MARKER__} - END : Test_Sender_Impl::Sender_exec_i[user_private_ops] //@} diff --git a/connectors/psdd4ccm/tests/latency/components/receiver/latency_receiver_exec.h b/connectors/psdd4ccm/tests/latency/components/receiver/latency_receiver_exec.h index 2f101b33d..05b5fbc76 100644 --- a/connectors/psdd4ccm/tests/latency/components/receiver/latency_receiver_exec.h +++ b/connectors/psdd4ccm/tests/latency/components/receiver/latency_receiver_exec.h @@ -169,7 +169,7 @@ namespace Test_Receiver_Impl /** @name User defined private operations. */ //@{ //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test_Receiver_Impl::Receiver_exec_i[user_private_ops] - void start (void); + void start (); //@@{__RIDL_REGEN_MARKER__} - END : Test_Receiver_Impl::Receiver_exec_i[user_private_ops] //@} diff --git a/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp b/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp index aebcfa8b2..9f0c65e73 100644 --- a/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp +++ b/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp @@ -341,7 +341,7 @@ namespace Test_Sender_Impl } void - Sender_exec_i::calc_results (void) + Sender_exec_i::calc_results () { if (this->iteration_nr_ == 0) return; // ignore first iteration @@ -515,7 +515,7 @@ namespace Test_Sender_Impl } void - Sender_exec_i::calculate_clock_overhead (void) + Sender_exec_i::calculate_clock_overhead () { int num_of_loops_clock = 320; uint64_t begin_time = 0; diff --git a/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.h b/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.h index 6dda9b8cd..9ec499409 100644 --- a/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.h +++ b/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.h @@ -254,11 +254,11 @@ namespace Test_Sender_Impl /** @name User defined private operations. */ //@{ //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test_Sender_Impl::Sender_exec_i[user_private_ops] - void start (void); - void calc_results (void); - void reset_results (void); - void init_values (void); - void calculate_clock_overhead (void); + void start (); + void calc_results (); + void reset_results (); + void init_values (); + void calculate_clock_overhead (); void record_time (uint64_t receive_time); //@@{__RIDL_REGEN_MARKER__} - END : Test_Sender_Impl::Sender_exec_i[user_private_ops] //@} diff --git a/ddsx11/tests/latency/sender/main.cpp b/ddsx11/tests/latency/sender/main.cpp index bc21c67c8..0ec5a91b3 100644 --- a/ddsx11/tests/latency/sender/main.cpp +++ b/ddsx11/tests/latency/sender/main.cpp @@ -137,10 +137,10 @@ class TestExecutor private: void usage (); bool parse_args (int argc, char * argv[]); - void calc_results (void); - void reset_results (void); - void init_values (void); - void calculate_clock_overhead (void); + void calc_results (); + void reset_results (); + void init_values (); + void calculate_clock_overhead (); void record_time (uint64_t receive_time); void start_publishing (); void start (); @@ -737,7 +737,7 @@ TestExecutor::reset_results() } void -TestExecutor::calc_results (void) +TestExecutor::calc_results () { if (this->iteration_nr_ == 0) return; // ignore first iteration @@ -907,7 +907,7 @@ TestExecutor::record_time (uint64_t receive_time) } void -TestExecutor::calculate_clock_overhead (void) +TestExecutor::calculate_clock_overhead () { int num_of_loops_clock = 320; uint64_t begin_time = 0; @@ -922,7 +922,7 @@ TestExecutor::calculate_clock_overhead (void) } void -TestExecutor::init_values (void) +TestExecutor::init_values () { this->duration_times_.reset (new uint64_t[this->samples_]); this->iteration_results_.reset (new IterationResult[this->iterations_]); diff --git a/ddsx11/tests/minimal_latency/sender/main.cpp b/ddsx11/tests/minimal_latency/sender/main.cpp index 2500fa071..e592bd21e 100644 --- a/ddsx11/tests/minimal_latency/sender/main.cpp +++ b/ddsx11/tests/minimal_latency/sender/main.cpp @@ -125,10 +125,10 @@ class TestExecutor private: void usage (); bool parse_args (int argc, char * argv[]); - void calc_results (void); - void reset_results (void); - void init_values (void); - void calculate_clock_overhead (void); + void calc_results (); + void reset_results (); + void init_values (); + void calculate_clock_overhead (); void record_time (uint64_t receive_time); void start_publishing (); void start (); @@ -661,7 +661,7 @@ TestExecutor::reset_results() } void -TestExecutor::calc_results (void) +TestExecutor::calc_results () { if (this->iteration_nr_ == 0) return; // ignore first iteration @@ -831,7 +831,7 @@ TestExecutor::record_time (uint64_t receive_time) } void -TestExecutor::calculate_clock_overhead (void) +TestExecutor::calculate_clock_overhead () { int num_of_loops_clock = 320; uint64_t begin_time = 0; @@ -846,7 +846,7 @@ TestExecutor::calculate_clock_overhead (void) } void -TestExecutor::init_values (void) +TestExecutor::init_values () { this->duration_times_.reset (new uint64_t[this->samples_]); this->iteration_results_.reset (new IterationResult[this->iterations_]); From a1c49b04377f42bfdc94d16bc7400ac792eda884 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Fri, 17 Nov 2023 09:03:18 +0100 Subject: [PATCH 2/2] Removed redundant void * connectors/dds4ccm/tests/latency/components/receiver/latency_receiver_exec.h: * connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp: * connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp: --- .../tests/latency/components/receiver/latency_receiver_exec.h | 2 +- .../tests/latency/components/sender/latency_sender_exec.cpp | 4 ++-- .../tests/latency/components/sender/latency_sender_exec.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connectors/dds4ccm/tests/latency/components/receiver/latency_receiver_exec.h b/connectors/dds4ccm/tests/latency/components/receiver/latency_receiver_exec.h index bba991a18..53fd6f76c 100644 --- a/connectors/dds4ccm/tests/latency/components/receiver/latency_receiver_exec.h +++ b/connectors/dds4ccm/tests/latency/components/receiver/latency_receiver_exec.h @@ -222,7 +222,7 @@ namespace Test_Receiver_Impl /** @name User defined private operations. */ //@{ //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test_Receiver_Impl::Receiver_exec_i[user_private_ops] - void start (void); + void start (); //@@{__RIDL_REGEN_MARKER__} - END : Test_Receiver_Impl::Receiver_exec_i[user_private_ops] //@} diff --git a/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp b/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp index 62053ab81..afe24fd94 100644 --- a/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp +++ b/connectors/dds4ccm/tests/latency/components/sender/latency_sender_exec.cpp @@ -654,7 +654,7 @@ namespace Test_Sender_Impl } void - Sender_exec_i::calculate_clock_overhead (void) + Sender_exec_i::calculate_clock_overhead () { int num_of_loops_clock = 320; uint64_t begin_time = 0; @@ -669,7 +669,7 @@ namespace Test_Sender_Impl } void - Sender_exec_i::init_values (void) + Sender_exec_i::init_values () { this->duration_times_.reset (new uint64_t[this->samples_]); this->iteration_results_.reset (new IterationResult[this->iterations_]); diff --git a/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp b/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp index 9f0c65e73..91e25b6e1 100644 --- a/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp +++ b/connectors/psdd4ccm/tests/latency/components/sender/latency_sender_exec.cpp @@ -530,7 +530,7 @@ namespace Test_Sender_Impl } void - Sender_exec_i::init_values (void) + Sender_exec_i::init_values () { this->duration_times_.reset (new uint64_t[this->samples_]); this->iteration_results_.reset (new IterationResult[this->iterations_]);