From ab1ed52fc7193d3e01e1bb9812731177d628bc7b Mon Sep 17 00:00:00 2001 From: Adrien Cassagne Date: Fri, 26 Jul 2024 16:41:09 +0200 Subject: [PATCH] Try to fix MSVC compilation error. --- include/Module/Stateful/Adaptor/Adaptor.hpp | 2 +- include/Module/Stateful/Set/Set.hpp | 2 +- include/Module/Stateful/Stateful.hpp | 55 +++++++++++---------- include/Module/Stateless/Stateless.hpp | 50 +++++++++---------- src/Module/Stateful/Stateful.cpp | 6 +++ 5 files changed, 61 insertions(+), 54 deletions(-) diff --git a/include/Module/Stateful/Adaptor/Adaptor.hpp b/include/Module/Stateful/Adaptor/Adaptor.hpp index b1313b6..d9fcbcf 100644 --- a/include/Module/Stateful/Adaptor/Adaptor.hpp +++ b/include/Module/Stateful/Adaptor/Adaptor.hpp @@ -112,7 +112,7 @@ class Adaptor const std::vector& datatype, const size_t buffer_size); using Stateful::deep_copy; - virtual void deep_copy(const Adaptor& m); + void deep_copy(const Adaptor& m); inline bool is_full(const size_t id); inline bool is_empty(const size_t id); inline size_t n_free_slots(const size_t id); diff --git a/include/Module/Stateful/Set/Set.hpp b/include/Module/Stateful/Set/Set.hpp index 7fa3a30..1402ed8 100644 --- a/include/Module/Stateful/Set/Set.hpp +++ b/include/Module/Stateful/Set/Set.hpp @@ -49,7 +49,7 @@ class Set : public Stateful protected: using Stateful::deep_copy; - virtual void deep_copy(const Set& m); + void deep_copy(const Set& m); }; } } diff --git a/include/Module/Stateful/Stateful.hpp b/include/Module/Stateful/Stateful.hpp index 0e7d6a5..dcf8443 100644 --- a/include/Module/Stateful/Stateful.hpp +++ b/include/Module/Stateful/Stateful.hpp @@ -22,33 +22,34 @@ class Stateful : public Module virtual ~Stateful() = default; protected: - using module::Module::deep_copy; - - using module::Module::set_name; - using module::Module::set_short_name; - - using module::Module::create_task; - using module::Module::create_tsk; - - using module::Module::create_sck_fwd; - using module::Module::create_sck_in; - using module::Module::create_sck_out; - using module::Module::create_socket_fwd; - using module::Module::create_socket_in; - using module::Module::create_socket_out; - - using module::Module::create_2d_sck_fwd; - using module::Module::create_2d_sck_in; - using module::Module::create_2d_sck_out; - using module::Module::create_2d_socket_fwd; - using module::Module::create_2d_socket_in; - using module::Module::create_2d_socket_out; - - using module::Module::create_cdl; - using module::Module::create_codelet; - using module::Module::register_timer; - using module::Module::set_n_frames_per_wave; - using module::Module::set_single_wave; + using Module::deep_copy; + void deep_copy(const Stateful& m); + + using Module::set_name; + using Module::set_short_name; + + using Module::create_task; + using Module::create_tsk; + + using Module::create_sck_fwd; + using Module::create_sck_in; + using Module::create_sck_out; + using Module::create_socket_fwd; + using Module::create_socket_in; + using Module::create_socket_out; + + using Module::create_2d_sck_fwd; + using Module::create_2d_sck_in; + using Module::create_2d_sck_out; + using Module::create_2d_socket_fwd; + using Module::create_2d_socket_in; + using Module::create_2d_socket_out; + + using Module::create_cdl; + using Module::create_codelet; + using Module::register_timer; + using Module::set_n_frames_per_wave; + using Module::set_single_wave; }; } } diff --git a/include/Module/Stateless/Stateless.hpp b/include/Module/Stateless/Stateless.hpp index bc81294..3793dbf 100644 --- a/include/Module/Stateless/Stateless.hpp +++ b/include/Module/Stateless/Stateless.hpp @@ -22,31 +22,31 @@ class Stateless final : public Module virtual ~Stateless() = default; virtual Stateless* clone() const; - using module::Module::set_name; - using module::Module::set_short_name; - - using module::Module::create_task; - using module::Module::create_tsk; - - using module::Module::create_sck_fwd; - using module::Module::create_sck_in; - using module::Module::create_sck_out; - using module::Module::create_socket_fwd; - using module::Module::create_socket_in; - using module::Module::create_socket_out; - - using module::Module::create_2d_sck_fwd; - using module::Module::create_2d_sck_in; - using module::Module::create_2d_sck_out; - using module::Module::create_2d_socket_fwd; - using module::Module::create_2d_socket_in; - using module::Module::create_2d_socket_out; - - using module::Module::create_cdl; - using module::Module::create_codelet; - using module::Module::register_timer; - using module::Module::set_n_frames_per_wave; - using module::Module::set_single_wave; + using Module::set_name; + using Module::set_short_name; + + using Module::create_task; + using Module::create_tsk; + + using Module::create_sck_fwd; + using Module::create_sck_in; + using Module::create_sck_out; + using Module::create_socket_fwd; + using Module::create_socket_in; + using Module::create_socket_out; + + using Module::create_2d_sck_fwd; + using Module::create_2d_sck_in; + using Module::create_2d_sck_out; + using Module::create_2d_socket_fwd; + using Module::create_2d_socket_in; + using Module::create_2d_socket_out; + + using Module::create_cdl; + using Module::create_codelet; + using Module::register_timer; + using Module::set_n_frames_per_wave; + using Module::set_single_wave; }; } } diff --git a/src/Module/Stateful/Stateful.cpp b/src/Module/Stateful/Stateful.cpp index 7a2471b..6afa6e1 100644 --- a/src/Module/Stateful/Stateful.cpp +++ b/src/Module/Stateful/Stateful.cpp @@ -7,3 +7,9 @@ Stateful::Stateful() : Module() { } + +void +Stateful::deep_copy(const Stateful& m) +{ + Module::deep_copy(m); +} \ No newline at end of file