From af8d80b6d49776fcfe6e516792c3f0f13257cd62 Mon Sep 17 00:00:00 2001 From: Alexander Sherikov Date: Sun, 8 Dec 2024 18:49:48 +0400 Subject: [PATCH] Cleanup visibility attributes. --- Makefile | 1 - extra_adapters/better_enums/better_enums.h | 12 ++--- .../boost_optional/boost_optional.h | 2 +- extra_adapters/boost_pointer/boost_pointer.h | 4 +- extra_adapters/eigen/eigen.h | 32 ++++++------- extra_adapters/rosmsg/rosmsg_geometry_msgs.h | 18 ++++---- .../graphviz/ariles2/visitors/graphviz.h | 12 ++--- extra_visitors/graphviz/src/writer.cpp | 6 +-- .../jsonnet/ariles2/visitors/jsonnet.h | 2 +- .../jsonnet/ariles2/visitors/jsonnet/reader.h | 6 +-- extra_visitors/jsonnet/src/reader.cpp | 2 +- .../msgpack/ariles2/visitors/msgpack.h | 4 +- .../msgpack/ariles2/visitors/msgpack/reader.h | 4 +- .../ariles2/visitors/msgpack/reader_compact.h | 4 +- .../msgpack/ariles2/visitors/msgpack/writer.h | 4 +- .../ariles2/visitors/msgpack/writer_compact.h | 4 +- extra_visitors/msgpack/src/reader.cpp | 2 +- extra_visitors/msgpack/src/reader_compact.cpp | 2 +- extra_visitors/msgpack/src/writer.cpp | 2 +- extra_visitors/msgpack/src/writer_compact.cpp | 2 +- .../namevalue/ariles2/visitors/namevalue.h | 2 +- .../ariles2/visitors/namevalue/writer.h | 9 ++-- .../namevalue2/ariles2/visitors/namevalue2.h | 8 ++-- extra_visitors/namevalue2/src/writer.cpp | 2 +- .../octave/ariles2/visitors/octave.h | 6 +-- extra_visitors/octave/src/writer.cpp | 4 +- .../protobuf3/ariles2/visitors/protobuf3.h | 4 +- .../ariles2/visitors/protobuf3/reader.h | 2 +- .../ariles2/visitors/protobuf3/writer.h | 2 +- .../pugixml/ariles2/visitors/pugixml.h | 2 +- .../pugixml/ariles2/visitors/pugixml/reader.h | 4 +- .../pugixml/ariles2/visitors/pugixml/writer.h | 4 +- extra_visitors/pugixml/src/reader.cpp | 4 +- extra_visitors/pugixml/src/writer.cpp | 4 +- .../rapidjson/ariles2/visitors/rapidjson.h | 2 +- .../ariles2/visitors/rapidjson/reader.h | 4 +- .../ariles2/visitors/rapidjson/writer.h | 4 +- extra_visitors/rapidjson/src/common.h | 2 +- extra_visitors/rapidjson/src/istreamwrapper.h | 2 +- extra_visitors/rapidjson/src/reader.cpp | 6 +-- extra_visitors/rapidjson/src/writer.cpp | 2 +- .../ros2param/ariles2/visitors/ros2param.h | 4 +- .../ariles2/visitors/ros2param/declarator.h | 4 +- .../ariles2/visitors/ros2param/reader.h | 4 +- .../ariles2/visitors/ros2param/writer.h | 4 +- extra_visitors/ros2param/src/declarator.cpp | 2 +- extra_visitors/ros2param/src/modifier.h | 2 +- extra_visitors/ros2param/src/node_wrapper.h | 4 +- extra_visitors/ros2param/src/reader.cpp | 4 +- extra_visitors/ros2param/src/writer.cpp | 2 +- .../rosparam/ariles2/visitors/rosparam.h | 2 +- .../ariles2/visitors/rosparam/reader.h | 4 +- .../ariles2/visitors/rosparam/writer.h | 4 +- extra_visitors/rosparam/src/common.h | 2 +- extra_visitors/rosparam/src/reader.cpp | 2 +- extra_visitors/rosparam/src/writer.cpp | 2 +- .../yaml_cpp/ariles2/visitors/yaml_cpp.h | 2 +- .../ariles2/visitors/yaml_cpp/reader.h | 4 +- .../ariles2/visitors/yaml_cpp/writer.h | 4 +- extra_visitors/yaml_cpp/src/reader.cpp | 8 ++-- extra_visitors/yaml_cpp/src/writer.cpp | 2 +- include/ariles2/adapters/basic.h | 46 +++++++++---------- include/ariles2/adapters/generic_pointer.h | 18 ++++---- include/ariles2/adapters/pointer.h | 4 +- include/ariles2/adapters/std_map.h | 18 ++++---- include/ariles2/adapters/std_pair.h | 18 ++++---- include/ariles2/adapters/std_vector.h | 18 ++++---- include/ariles2/ariles.h | 6 +-- include/ariles2/extra.h | 8 ++-- include/ariles2/internal/helpers.h | 9 ++-- include/ariles2/internal/trace.h | 6 +-- include/ariles2/internal/visibility.h | 28 +++++------ include/ariles2/types.h | 11 ++--- include/ariles2/visitors/aggregate.h | 24 +++++----- include/ariles2/visitors/common.h | 10 ++-- include/ariles2/visitors/compare.h | 6 +-- include/ariles2/visitors/config.h | 4 +- include/ariles2/visitors/copyfrom.h | 6 +-- include/ariles2/visitors/copyto.h | 6 +-- include/ariles2/visitors/count.h | 3 +- include/ariles2/visitors/count_missing.h | 3 +- include/ariles2/visitors/defaults.h | 4 +- include/ariles2/visitors/finalize.h | 2 +- include/ariles2/visitors/prewrite.h | 2 +- include/ariles2/visitors/process.h | 2 +- include/ariles2/visitors/read.h | 2 +- include/ariles2/visitors/serialization.h | 4 +- include/ariles2/visitors/write.h | 6 +-- include/ariles2/visitors_impl/read.h | 2 +- include/ariles2/visitors_impl/serialization.h | 6 +-- include/ariles2/visitors_impl/write.h | 2 +- 91 files changed, 271 insertions(+), 283 deletions(-) diff --git a/Makefile b/Makefile index b91cbf2f..5acf7435 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,6 @@ updateutils: addutils git show remotes/cmakeut/master:cmake/cmakeut_list_filenames.cmake > cmake/cmakeut_list_filenames.cmake # git show remotes/cpput/master:include/cpput/exception.h > include/ariles2/internal/exception.h - git show remotes/cpput/master:include/cpput/visibility.h > include/ariles2/internal/visibility.h git show remotes/cpput/master:include/cpput/misc.h > include/ariles2/internal/misc.h git show remotes/cpput/master:include/cpput/trace.h > include/ariles2/internal/trace.h git show remotes/cpput/master:include/cpput/concat.h > include/ariles2/internal/concat.h diff --git a/extra_adapters/better_enums/better_enums.h b/extra_adapters/better_enums/better_enums.h index fe5e8f97..d818c5d0 100644 --- a/extra_adapters/better_enums/better_enums.h +++ b/extra_adapters/better_enums/better_enums.h @@ -17,7 +17,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, t_BetterEnum &entry, const t_Flags & /*param*/, @@ -41,7 +41,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const t_BetterEnum &entry, const t_Flags ¶m, @@ -63,7 +63,7 @@ namespace ariles2 namespace compare { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const t_BetterEnum &left, const t_BetterEnum &right, @@ -87,7 +87,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( t_Visitor & /*visitor*/, t_BetterEnum &entry, const typename t_Visitor::Parameters & /*param*/, @@ -113,7 +113,7 @@ namespace ariles2 namespace copyfrom { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor & /*visitor*/, t_BetterEnum &left, const t_BetterEnum &right, @@ -133,7 +133,7 @@ namespace ariles2 namespace copyto { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor & /*visitor*/, const t_BetterEnum &left, t_BetterEnum &right, diff --git a/extra_adapters/boost_optional/boost_optional.h b/extra_adapters/boost_optional/boost_optional.h index 53fab3ed..722b46d6 100644 --- a/extra_adapters/boost_optional/boost_optional.h +++ b/extra_adapters/boost_optional/boost_optional.h @@ -16,7 +16,7 @@ namespace ariles2 { template - class PointerHandler> + class ARILES2_VISIBILITY_PUBLIC PointerHandler> { public: using Pointer = boost::optional; diff --git a/extra_adapters/boost_pointer/boost_pointer.h b/extra_adapters/boost_pointer/boost_pointer.h index eee26149..f090bce7 100644 --- a/extra_adapters/boost_pointer/boost_pointer.h +++ b/extra_adapters/boost_pointer/boost_pointer.h @@ -17,7 +17,7 @@ namespace ariles2 { template - class PointerHandler> + class ARILES2_VISIBILITY_PUBLIC PointerHandler> { public: using Pointer = boost::shared_ptr; @@ -54,7 +54,7 @@ namespace ariles2 namespace ariles2 { template - class PointerHandler> + class ARILES2_VISIBILITY_PUBLIC PointerHandler> { public: using Pointer = boost::movelib::unique_ptr; diff --git a/extra_adapters/eigen/eigen.h b/extra_adapters/eigen/eigen.h index afa381b7..12e91c38 100644 --- a/extra_adapters/eigen/eigen.h +++ b/extra_adapters/eigen/eigen.h @@ -20,7 +20,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, Eigen::Matrix &entry, const typename t_Visitor::Parameters ¶m) @@ -47,7 +47,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, Eigen::Matrix &entry, const typename t_Visitor::Parameters ¶meters) @@ -83,7 +83,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, Eigen::Transform &entry, const typename t_Visitor::Parameters ¶m) @@ -100,7 +100,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, Eigen::Quaternion &entry, const typename t_Visitor::Parameters ¶meters) @@ -126,7 +126,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const Eigen::Matrix &entry, const typename t_Visitor::Parameters ¶m) @@ -142,7 +142,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const Eigen::Matrix &entry, const typename t_Visitor::Parameters ¶m) @@ -166,7 +166,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const Eigen::Transform &entry, const typename t_Visitor::Parameters ¶m) @@ -177,7 +177,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const Eigen::Quaternion &entry, const t_Flags ¶m) @@ -203,7 +203,7 @@ namespace ariles2 namespace compare { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const Eigen::Transform &left, const Eigen::Transform &right, @@ -215,7 +215,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const Eigen::Quaternion &left, const Eigen::Quaternion &right, @@ -227,7 +227,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const Eigen::Matrix &left, const Eigen::Matrix &right, @@ -246,7 +246,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, Eigen::Matrix &entry, const typename t_Visitor::Parameters ¶m) @@ -278,7 +278,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, Eigen::Transform &entry, const typename t_Visitor::Parameters & /*param*/) @@ -289,7 +289,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, Eigen::Quaternion &entry, const typename t_Visitor::Parameters & /*param*/) @@ -306,7 +306,7 @@ namespace ariles2 namespace copyfrom { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor & /*visitor*/, t_Left &left, const t_Right &right, @@ -323,7 +323,7 @@ namespace ariles2 namespace copyto { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor & /*visitor*/, const t_Left &left, t_Right &right, diff --git a/extra_adapters/rosmsg/rosmsg_geometry_msgs.h b/extra_adapters/rosmsg/rosmsg_geometry_msgs.h index a57610ad..bdbcbe26 100644 --- a/extra_adapters/rosmsg/rosmsg_geometry_msgs.h +++ b/extra_adapters/rosmsg/rosmsg_geometry_msgs.h @@ -18,7 +18,7 @@ namespace ariles2 namespace copyfrom { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor & /*visitor*/, Eigen::Matrix &left, const geometry_msgs::Vector3 &right, @@ -31,7 +31,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor & /*visitor*/, Eigen::Matrix &left, const geometry_msgs::Vector3 &right, @@ -46,7 +46,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( const t_Visitor & /*visitor*/, Eigen::Quaternion &left, const geometry_msgs::Quaternion &right, @@ -61,7 +61,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( const t_Visitor &visitor, Eigen::Transform &left, const geometry_msgs::Transform &right, @@ -85,7 +85,7 @@ namespace ariles2 namespace copyto { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor & /*visitor*/, const Eigen::Matrix &left, geometry_msgs::Vector3 &right, @@ -98,7 +98,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor & /*visitor*/, const Eigen::Block &left, geometry_msgs::Vector3 &right, @@ -111,7 +111,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor & /*visitor*/, const Eigen::Matrix &left, geometry_msgs::Vector3 &right, @@ -126,7 +126,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( const t_Visitor & /*visitor*/, const Eigen::Quaternion &left, geometry_msgs::Quaternion &right, @@ -141,7 +141,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( const t_Visitor &visitor, const Eigen::Transform &left, geometry_msgs::Transform &right, diff --git a/extra_visitors/graphviz/ariles2/visitors/graphviz.h b/extra_visitors/graphviz/ariles2/visitors/graphviz.h index 3170bdc2..419cc795 100644 --- a/extra_visitors/graphviz/ariles2/visitors/graphviz.h +++ b/extra_visitors/graphviz/ariles2/visitors/graphviz.h @@ -34,14 +34,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Visitor; + class ARILES2_VISIBILITY_PUBLIC Visitor; } - class ARILES2_VISIBILITY_ATTRIBUTE Parameters : public write::Parameters + class ARILES2_VISIBILITY_PUBLIC Parameters : public write::Parameters { public: - class ARILES2_VISIBILITY_ATTRIBUTE NodeOptions + class ARILES2_VISIBILITY_PUBLIC NodeOptions { public: std::string id_; @@ -104,7 +104,7 @@ namespace ariles2 }; - class ARILES2_VISIBILITY_ATTRIBUTE Visitor + class ARILES2_VISIBILITY_PUBLIC Visitor : public serialization::PIMPLVisitor, impl::Visitor> { protected: @@ -150,7 +150,7 @@ namespace ariles2 }; - class ARILES2_VISIBILITY_ATTRIBUTE Base : public entry::ConstBase + class ARILES2_VISIBILITY_PUBLIC Base : public entry::ConstBase { }; @@ -183,7 +183,7 @@ namespace ariles2 * @brief Graphviz visitor. * @ingroup graphviz */ - struct ARILES2_VISIBILITY_ATTRIBUTE graphviz + struct ARILES2_VISIBILITY_PUBLIC graphviz { using Parameters = ns_graphviz::Parameters; using Visitor = ns_graphviz::Visitor; diff --git a/extra_visitors/graphviz/src/writer.cpp b/extra_visitors/graphviz/src/writer.cpp index 5f1e7e07..e3afc601 100644 --- a/extra_visitors/graphviz/src/writer.cpp +++ b/extra_visitors/graphviz/src/writer.cpp @@ -23,7 +23,7 @@ namespace ariles2 { namespace ns_graphviz { - class NodeWrapper : public serialization::Node + class ARILES2_VISIBILITY_PRIVATE NodeWrapper : public serialization::Node { public: std::string actual_id_; @@ -72,8 +72,8 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Visitor : public serialization::NodeStackBase, - public write::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Visitor : public serialization::NodeStackBase, + public write::FileVisitorImplementation { public: std::set all_ids_; diff --git a/extra_visitors/jsonnet/ariles2/visitors/jsonnet.h b/extra_visitors/jsonnet/ariles2/visitors/jsonnet.h index 3887e6ac..2c80a3b7 100644 --- a/extra_visitors/jsonnet/ariles2/visitors/jsonnet.h +++ b/extra_visitors/jsonnet/ariles2/visitors/jsonnet.h @@ -32,7 +32,7 @@ namespace ariles2 * @ingroup jsonnet */ template - struct ARILES2_VISIBILITY_ATTRIBUTE jsonnet + struct ARILES2_VISIBILITY_PUBLIC jsonnet { using Reader = ariles2::cfgread::Visitor>; using Writer = ariles2::cfgwrite::Visitor; diff --git a/extra_visitors/jsonnet/ariles2/visitors/jsonnet/reader.h b/extra_visitors/jsonnet/ariles2/visitors/jsonnet/reader.h index c19a0219..ba54d7dd 100644 --- a/extra_visitors/jsonnet/ariles2/visitors/jsonnet/reader.h +++ b/extra_visitors/jsonnet/ariles2/visitors/jsonnet/reader.h @@ -17,9 +17,9 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE JsonnetPreprocessor; + class ARILES2_VISIBILITY_PUBLIC JsonnetPreprocessor; - class ARILES2_VISIBILITY_ATTRIBUTE Reader + class ARILES2_VISIBILITY_PUBLIC Reader { protected: using JsonnetPreprocessorPtr = std::shared_ptr; @@ -40,7 +40,7 @@ namespace ariles2 template - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public t_ParentVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public t_ParentVisitor { protected: impl::Reader impl_; diff --git a/extra_visitors/jsonnet/src/reader.cpp b/extra_visitors/jsonnet/src/reader.cpp index 5c2edf70..e9f3e68b 100644 --- a/extra_visitors/jsonnet/src/reader.cpp +++ b/extra_visitors/jsonnet/src/reader.cpp @@ -21,7 +21,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE JsonnetPreprocessor + class ARILES2_VISIBILITY_PUBLIC JsonnetPreprocessor { public: JsonnetVm *vm_; diff --git a/extra_visitors/msgpack/ariles2/visitors/msgpack.h b/extra_visitors/msgpack/ariles2/visitors/msgpack.h index 87dcc225..6bd1ec4a 100644 --- a/extra_visitors/msgpack/ariles2/visitors/msgpack.h +++ b/extra_visitors/msgpack/ariles2/visitors/msgpack.h @@ -39,7 +39,7 @@ namespace ariles2 * @brief MessagePack visitor. * @ingroup msgpack */ - struct ARILES2_VISIBILITY_ATTRIBUTE msgpack + struct ARILES2_VISIBILITY_PUBLIC msgpack { using Reader = ariles2::cfgread::Visitor; using Writer = ariles2::cfgwrite::Visitor; @@ -55,7 +55,7 @@ namespace ariles2 * * @ingroup msgpack */ - struct ARILES2_VISIBILITY_ATTRIBUTE msgpack_compact + struct ARILES2_VISIBILITY_PUBLIC msgpack_compact { using Reader = ariles2::cfgread::Visitor; using Writer = ariles2::cfgwrite::Visitor; diff --git a/extra_visitors/msgpack/ariles2/visitors/msgpack/reader.h b/extra_visitors/msgpack/ariles2/visitors/msgpack/reader.h index 874ba18c..2549e5af 100644 --- a/extra_visitors/msgpack/ariles2/visitors/msgpack/reader.h +++ b/extra_visitors/msgpack/ariles2/visitors/msgpack/reader.h @@ -19,14 +19,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { protected: bool startRoot(const std::string &name); diff --git a/extra_visitors/msgpack/ariles2/visitors/msgpack/reader_compact.h b/extra_visitors/msgpack/ariles2/visitors/msgpack/reader_compact.h index 78f25a5d..b495486c 100644 --- a/extra_visitors/msgpack/ariles2/visitors/msgpack/reader_compact.h +++ b/extra_visitors/msgpack/ariles2/visitors/msgpack/reader_compact.h @@ -21,14 +21,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { public: /** diff --git a/extra_visitors/msgpack/ariles2/visitors/msgpack/writer.h b/extra_visitors/msgpack/ariles2/visitors/msgpack/writer.h index 53005145..a573ebf9 100644 --- a/extra_visitors/msgpack/ariles2/visitors/msgpack/writer.h +++ b/extra_visitors/msgpack/ariles2/visitors/msgpack/writer.h @@ -19,14 +19,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: /** diff --git a/extra_visitors/msgpack/ariles2/visitors/msgpack/writer_compact.h b/extra_visitors/msgpack/ariles2/visitors/msgpack/writer_compact.h index 19e801a4..b80afe0f 100644 --- a/extra_visitors/msgpack/ariles2/visitors/msgpack/writer_compact.h +++ b/extra_visitors/msgpack/ariles2/visitors/msgpack/writer_compact.h @@ -19,14 +19,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: /** diff --git a/extra_visitors/msgpack/src/reader.cpp b/extra_visitors/msgpack/src/reader.cpp index b84be9dc..8bb4b505 100644 --- a/extra_visitors/msgpack/src/reader.cpp +++ b/extra_visitors/msgpack/src/reader.cpp @@ -25,7 +25,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::NodeStackBase>, public read::FileVisitorImplementation { diff --git a/extra_visitors/msgpack/src/reader_compact.cpp b/extra_visitors/msgpack/src/reader_compact.cpp index f7a81e17..ca274493 100644 --- a/extra_visitors/msgpack/src/reader_compact.cpp +++ b/extra_visitors/msgpack/src/reader_compact.cpp @@ -26,7 +26,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::NodeStackBase>, public read::FileVisitorImplementation { diff --git a/extra_visitors/msgpack/src/writer.cpp b/extra_visitors/msgpack/src/writer.cpp index bfd57559..bb685b1c 100644 --- a/extra_visitors/msgpack/src/writer.cpp +++ b/extra_visitors/msgpack/src/writer.cpp @@ -22,7 +22,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public write::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Writer : public write::FileVisitorImplementation { public: std::shared_ptr<::msgpack::packer> packer_; diff --git a/extra_visitors/msgpack/src/writer_compact.cpp b/extra_visitors/msgpack/src/writer_compact.cpp index 27ab145b..e1f8d746 100644 --- a/extra_visitors/msgpack/src/writer_compact.cpp +++ b/extra_visitors/msgpack/src/writer_compact.cpp @@ -21,7 +21,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public write::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Writer : public write::FileVisitorImplementation { public: std::shared_ptr<::msgpack::packer> packer_; diff --git a/extra_visitors/namevalue/ariles2/visitors/namevalue.h b/extra_visitors/namevalue/ariles2/visitors/namevalue.h index 9b3456f6..2621f3b7 100644 --- a/extra_visitors/namevalue/ariles2/visitors/namevalue.h +++ b/extra_visitors/namevalue/ariles2/visitors/namevalue.h @@ -33,7 +33,7 @@ namespace ariles2 * @brief NameValue visitor. * @ingroup namevalue */ - struct ARILES2_VISIBILITY_ATTRIBUTE namevalue + struct ARILES2_VISIBILITY_PUBLIC namevalue { using Writer = ariles2::cfgwrite::Visitor; }; diff --git a/extra_visitors/namevalue/ariles2/visitors/namevalue/writer.h b/extra_visitors/namevalue/ariles2/visitors/namevalue/writer.h index 45133625..2b7df281 100644 --- a/extra_visitors/namevalue/ariles2/visitors/namevalue/writer.h +++ b/extra_visitors/namevalue/ariles2/visitors/namevalue/writer.h @@ -25,13 +25,13 @@ namespace ariles2 template - class ARILES2_VISIBILITY_ATTRIBUTE NameValuePairHandler + class ARILES2_VISIBILITY_PUBLIC NameValuePairHandler { }; template <> - class ARILES2_VISIBILITY_ATTRIBUTE NameValuePairHandler + class ARILES2_VISIBILITY_PUBLIC NameValuePairHandler { public: static inline std::string &name(NameValuePair &pair) // cppcheck-suppress constParameter @@ -50,9 +50,8 @@ namespace ariles2 * @brief Configuration writer class */ template - class ARILES2_VISIBILITY_ATTRIBUTE GenericWriter - : public ariles2::write::Visitor, - public serialization::NodeStackBase + class ARILES2_VISIBILITY_PUBLIC GenericWriter : public ariles2::write::Visitor, + public serialization::NodeStackBase { protected: std::size_t reserve_; diff --git a/extra_visitors/namevalue2/ariles2/visitors/namevalue2.h b/extra_visitors/namevalue2/ariles2/visitors/namevalue2.h index f3f2112f..911e12a6 100644 --- a/extra_visitors/namevalue2/ariles2/visitors/namevalue2.h +++ b/extra_visitors/namevalue2/ariles2/visitors/namevalue2.h @@ -34,10 +34,10 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } - class NameValueContainer + class ARILES2_VISIBILITY_PUBLIC NameValueContainer { public: virtual ~NameValueContainer() = default; @@ -53,7 +53,7 @@ namespace ariles2 /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const std::shared_ptr &container, const std::size_t reserve = 0); @@ -89,7 +89,7 @@ namespace ariles2 * @brief NameValue2 visitor. * @ingroup namevalue2 */ - struct ARILES2_VISIBILITY_ATTRIBUTE namevalue2 + struct ARILES2_VISIBILITY_PUBLIC namevalue2 { using NameValueContainer = ns_namevalue2::NameValueContainer; using Writer = ns_namevalue2::Writer; diff --git a/extra_visitors/namevalue2/src/writer.cpp b/extra_visitors/namevalue2/src/writer.cpp index 86444e3c..d71668bf 100644 --- a/extra_visitors/namevalue2/src/writer.cpp +++ b/extra_visitors/namevalue2/src/writer.cpp @@ -19,7 +19,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::NodeStackBase + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::NodeStackBase { public: bool initialize_names_; diff --git a/extra_visitors/octave/ariles2/visitors/octave.h b/extra_visitors/octave/ariles2/visitors/octave.h index ff9dfdc1..2038a5bd 100644 --- a/extra_visitors/octave/ariles2/visitors/octave.h +++ b/extra_visitors/octave/ariles2/visitors/octave.h @@ -35,14 +35,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const std::string &file_name); @@ -102,7 +102,7 @@ namespace ariles2 * @brief Octave visitor. * @ingroup octave */ - struct ARILES2_VISIBILITY_ATTRIBUTE octave + struct ARILES2_VISIBILITY_PUBLIC octave { using Writer = ariles2::cfgwrite::Visitor; }; diff --git a/extra_visitors/octave/src/writer.cpp b/extra_visitors/octave/src/writer.cpp index 45b5a625..3955981b 100644 --- a/extra_visitors/octave/src/writer.cpp +++ b/extra_visitors/octave/src/writer.cpp @@ -24,8 +24,8 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::NodeStackBase, - public write::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::NodeStackBase, + public write::FileVisitorImplementation { public: const std::string separator_ = "."; diff --git a/extra_visitors/protobuf3/ariles2/visitors/protobuf3.h b/extra_visitors/protobuf3/ariles2/visitors/protobuf3.h index 439f0cd4..0f2ed9ff 100644 --- a/extra_visitors/protobuf3/ariles2/visitors/protobuf3.h +++ b/extra_visitors/protobuf3/ariles2/visitors/protobuf3.h @@ -33,7 +33,7 @@ namespace ariles2 { namespace ns_protobuf3 { - class ARILES2_VISIBILITY_ATTRIBUTE Base + class ARILES2_VISIBILITY_PUBLIC Base { }; @@ -99,7 +99,7 @@ namespace ariles2 * @brief protobuf3 visitor. * @ingroup protobuf3 */ - struct ARILES2_VISIBILITY_ATTRIBUTE protobuf3 + struct ARILES2_VISIBILITY_PUBLIC protobuf3 { using Base = ns_protobuf3::Base; using Reader = ns_protobuf3::Reader; diff --git a/extra_visitors/protobuf3/ariles2/visitors/protobuf3/reader.h b/extra_visitors/protobuf3/ariles2/visitors/protobuf3/reader.h index b6896351..4b0a99f1 100644 --- a/extra_visitors/protobuf3/ariles2/visitors/protobuf3/reader.h +++ b/extra_visitors/protobuf3/ariles2/visitors/protobuf3/reader.h @@ -14,7 +14,7 @@ namespace ariles2 { namespace ns_protobuf3 { - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public visitor::Base + class ARILES2_VISIBILITY_PUBLIC Reader : public visitor::Base { public: using Parameters = visitor::Parameters; diff --git a/extra_visitors/protobuf3/ariles2/visitors/protobuf3/writer.h b/extra_visitors/protobuf3/ariles2/visitors/protobuf3/writer.h index 94e291c3..ea260c15 100644 --- a/extra_visitors/protobuf3/ariles2/visitors/protobuf3/writer.h +++ b/extra_visitors/protobuf3/ariles2/visitors/protobuf3/writer.h @@ -14,7 +14,7 @@ namespace ariles2 { namespace ns_protobuf3 { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public visitor::Base + class ARILES2_VISIBILITY_PUBLIC Writer : public visitor::Base { public: using Parameters = visitor::Parameters; diff --git a/extra_visitors/pugixml/ariles2/visitors/pugixml.h b/extra_visitors/pugixml/ariles2/visitors/pugixml.h index a577dd32..acce1da5 100644 --- a/extra_visitors/pugixml/ariles2/visitors/pugixml.h +++ b/extra_visitors/pugixml/ariles2/visitors/pugixml.h @@ -37,7 +37,7 @@ namespace ariles2 * @brief pugixml visitor. * @ingroup pugixml */ - struct ARILES2_VISIBILITY_ATTRIBUTE pugixml + struct ARILES2_VISIBILITY_PUBLIC pugixml { using Reader = ariles2::cfgread::Visitor; using Writer = ariles2::cfgwrite::Visitor; diff --git a/extra_visitors/pugixml/ariles2/visitors/pugixml/reader.h b/extra_visitors/pugixml/ariles2/visitors/pugixml/reader.h index 2f2cf62a..cd6fb69d 100644 --- a/extra_visitors/pugixml/ariles2/visitors/pugixml/reader.h +++ b/extra_visitors/pugixml/ariles2/visitors/pugixml/reader.h @@ -17,14 +17,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { protected: bool startRoot(const std::string &name); diff --git a/extra_visitors/pugixml/ariles2/visitors/pugixml/writer.h b/extra_visitors/pugixml/ariles2/visitors/pugixml/writer.h index 4dd9fb5f..577e5ed7 100644 --- a/extra_visitors/pugixml/ariles2/visitors/pugixml/writer.h +++ b/extra_visitors/pugixml/ariles2/visitors/pugixml/writer.h @@ -16,14 +16,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const std::string &file_name); diff --git a/extra_visitors/pugixml/src/reader.cpp b/extra_visitors/pugixml/src/reader.cpp index e854c0b8..755cdf5f 100644 --- a/extra_visitors/pugixml/src/reader.cpp +++ b/extra_visitors/pugixml/src/reader.cpp @@ -19,8 +19,8 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::NodeStackBase, - public read::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::NodeStackBase, + public read::FileVisitorImplementation { public: pugi::xml_document document_; diff --git a/extra_visitors/pugixml/src/writer.cpp b/extra_visitors/pugixml/src/writer.cpp index fc62c17d..ece05725 100644 --- a/extra_visitors/pugixml/src/writer.cpp +++ b/extra_visitors/pugixml/src/writer.cpp @@ -17,8 +17,8 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::NodeStackBase, - public write::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::NodeStackBase, + public write::FileVisitorImplementation { public: pugi::xml_document document_; diff --git a/extra_visitors/rapidjson/ariles2/visitors/rapidjson.h b/extra_visitors/rapidjson/ariles2/visitors/rapidjson.h index 2556b5fb..1b5983d6 100644 --- a/extra_visitors/rapidjson/ariles2/visitors/rapidjson.h +++ b/extra_visitors/rapidjson/ariles2/visitors/rapidjson.h @@ -37,7 +37,7 @@ namespace ariles2 * @brief JSON visitor. * @ingroup rapidjson */ - struct ARILES2_VISIBILITY_ATTRIBUTE rapidjson + struct ARILES2_VISIBILITY_PUBLIC rapidjson { using ReaderBase = ns_rapidjson::Reader; using WriterBase = ns_rapidjson::Writer; diff --git a/extra_visitors/rapidjson/ariles2/visitors/rapidjson/reader.h b/extra_visitors/rapidjson/ariles2/visitors/rapidjson/reader.h index 5c917424..c9b91fdb 100644 --- a/extra_visitors/rapidjson/ariles2/visitors/rapidjson/reader.h +++ b/extra_visitors/rapidjson/ariles2/visitors/rapidjson/reader.h @@ -16,14 +16,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { protected: // needed for jsonnet Reader diff --git a/extra_visitors/rapidjson/ariles2/visitors/rapidjson/writer.h b/extra_visitors/rapidjson/ariles2/visitors/rapidjson/writer.h index 2b651800..c8d7e24b 100644 --- a/extra_visitors/rapidjson/ariles2/visitors/rapidjson/writer.h +++ b/extra_visitors/rapidjson/ariles2/visitors/rapidjson/writer.h @@ -16,14 +16,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const std::string &file_name); diff --git a/extra_visitors/rapidjson/src/common.h b/extra_visitors/rapidjson/src/common.h index 3dfab33f..3ab796c2 100644 --- a/extra_visitors/rapidjson/src/common.h +++ b/extra_visitors/rapidjson/src/common.h @@ -31,7 +31,7 @@ namespace ariles2 namespace ns_rapidjson { template - class CPPUT_LIB_LOCAL ImplBase : public serialization::NodeStackBase + class ARILES2_VISIBILITY_PRIVATE ImplBase : public serialization::NodeStackBase { public: using RawNode = decltype(t_Node::node_); diff --git a/extra_visitors/rapidjson/src/istreamwrapper.h b/extra_visitors/rapidjson/src/istreamwrapper.h index 76a70769..a11b85e6 100644 --- a/extra_visitors/rapidjson/src/istreamwrapper.h +++ b/extra_visitors/rapidjson/src/istreamwrapper.h @@ -49,7 +49,7 @@ namespace ariles2 */ template - class CPPUT_LIB_LOCAL BasicIStreamWrapper + class ARILES2_VISIBILITY_PRIVATE BasicIStreamWrapper { public: using Ch = typename StreamType::char_type; diff --git a/extra_visitors/rapidjson/src/reader.cpp b/extra_visitors/rapidjson/src/reader.cpp index ced0cf97..81b4d9ab 100644 --- a/extra_visitors/rapidjson/src/reader.cpp +++ b/extra_visitors/rapidjson/src/reader.cpp @@ -20,7 +20,7 @@ namespace ariles2 { namespace impl { - class Node : public serialization::Node + class ARILES2_VISIBILITY_PRIVATE Node : public serialization::Node { public: const ::rapidjson::Value *node_; @@ -36,8 +36,8 @@ namespace ariles2 }; - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public ariles2::ns_rapidjson::ImplBase, - public read::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Reader : public ariles2::ns_rapidjson::ImplBase, + public read::FileVisitorImplementation { public: Reader() = default; diff --git a/extra_visitors/rapidjson/src/writer.cpp b/extra_visitors/rapidjson/src/writer.cpp index 97f88db8..c90376ba 100644 --- a/extra_visitors/rapidjson/src/writer.cpp +++ b/extra_visitors/rapidjson/src/writer.cpp @@ -25,7 +25,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer + class ARILES2_VISIBILITY_PUBLIC Writer : public ariles2::ns_rapidjson::ImplBase>, public write::FileVisitorImplementation { diff --git a/extra_visitors/ros2param/ariles2/visitors/ros2param.h b/extra_visitors/ros2param/ariles2/visitors/ros2param.h index ddb386da..40d83e89 100644 --- a/extra_visitors/ros2param/ariles2/visitors/ros2param.h +++ b/extra_visitors/ros2param/ariles2/visitors/ros2param.h @@ -36,13 +36,13 @@ namespace ariles2 * @brief ROS parameter server visitor. * @ingroup ros2param */ - struct ARILES2_VISIBILITY_ATTRIBUTE ros2param + struct ARILES2_VISIBILITY_PUBLIC ros2param { using Reader = ariles2::cfgread::Visitor; using Writer = ariles2::cfgwrite::Visitor; - class ARILES2_VISIBILITY_ATTRIBUTE Declarator + class ARILES2_VISIBILITY_PUBLIC Declarator : public aggregate::Visitor { public: diff --git a/extra_visitors/ros2param/ariles2/visitors/ros2param/declarator.h b/extra_visitors/ros2param/ariles2/visitors/ros2param/declarator.h index a67beff2..a6a4d4c7 100644 --- a/extra_visitors/ros2param/ariles2/visitors/ros2param/declarator.h +++ b/extra_visitors/ros2param/ariles2/visitors/ros2param/declarator.h @@ -17,7 +17,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Declarator; + class ARILES2_VISIBILITY_PUBLIC Declarator; } @@ -25,7 +25,7 @@ namespace ariles2 /** * @brief Parameter declarator */ - class ARILES2_VISIBILITY_ATTRIBUTE Declarator + class ARILES2_VISIBILITY_PUBLIC Declarator : public serialization::PIMPLVisitor { public: diff --git a/extra_visitors/ros2param/ariles2/visitors/ros2param/reader.h b/extra_visitors/ros2param/ariles2/visitors/ros2param/reader.h index d78cb490..6729a96c 100644 --- a/extra_visitors/ros2param/ariles2/visitors/ros2param/reader.h +++ b/extra_visitors/ros2param/ariles2/visitors/ros2param/reader.h @@ -17,7 +17,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } @@ -25,7 +25,7 @@ namespace ariles2 /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { protected: using Parent = serialization::PIMPLVisitor; diff --git a/extra_visitors/ros2param/ariles2/visitors/ros2param/writer.h b/extra_visitors/ros2param/ariles2/visitors/ros2param/writer.h index 55f84779..61945b30 100644 --- a/extra_visitors/ros2param/ariles2/visitors/ros2param/writer.h +++ b/extra_visitors/ros2param/ariles2/visitors/ros2param/writer.h @@ -17,7 +17,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } @@ -25,7 +25,7 @@ namespace ariles2 /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const rclcpp::node_interfaces::NodeParametersInterface::SharedPtr &nh); diff --git a/extra_visitors/ros2param/src/declarator.cpp b/extra_visitors/ros2param/src/declarator.cpp index d02ba34d..8abbd26c 100644 --- a/extra_visitors/ros2param/src/declarator.cpp +++ b/extra_visitors/ros2param/src/declarator.cpp @@ -23,7 +23,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Declarator : public ModifierImplBase + class ARILES2_VISIBILITY_PUBLIC Declarator : public ModifierImplBase { public: using ModifierImplBase::ModifierImplBase; diff --git a/extra_visitors/ros2param/src/modifier.h b/extra_visitors/ros2param/src/modifier.h index 7a7c7c3c..57f965c0 100644 --- a/extra_visitors/ros2param/src/modifier.h +++ b/extra_visitors/ros2param/src/modifier.h @@ -16,7 +16,7 @@ namespace ariles2 { namespace ns_ros2param { - class ARILES2_VISIBILITY_ATTRIBUTE ModifierImplBase : public serialization::NodeStackBase + class ARILES2_VISIBILITY_PUBLIC ModifierImplBase : public serialization::NodeStackBase { public: // https://docs.ros2.org/latest/api/rclcpp/classrclcpp_1_1Node.html diff --git a/extra_visitors/ros2param/src/node_wrapper.h b/extra_visitors/ros2param/src/node_wrapper.h index fb0e4c3e..1767f89f 100644 --- a/extra_visitors/ros2param/src/node_wrapper.h +++ b/extra_visitors/ros2param/src/node_wrapper.h @@ -12,7 +12,7 @@ namespace ariles2 { namespace ns_ros2param { - class NodeBase : public serialization::NodeString + class ARILES2_VISIBILITY_PRIVATE NodeBase : public serialization::NodeString { protected: using Parent = serialization::NodeString; @@ -43,7 +43,7 @@ namespace ariles2 }; - class ModifierNode : public NodeBase + class ARILES2_VISIBILITY_PRIVATE ModifierNode : public NodeBase { public: std::variant< diff --git a/extra_visitors/ros2param/src/reader.cpp b/extra_visitors/ros2param/src/reader.cpp index 8f23e99f..0a08d5be 100644 --- a/extra_visitors/ros2param/src/reader.cpp +++ b/extra_visitors/ros2param/src/reader.cpp @@ -22,7 +22,7 @@ namespace ariles2 { namespace ns_ros2param { - class ReaderNodeWrapper : public NodeBase + class ARILES2_VISIBILITY_PRIVATE ReaderNodeWrapper : public NodeBase { protected: std::set childs_; @@ -142,7 +142,7 @@ namespace ariles2 namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::NodeStackBase + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::NodeStackBase { public: // https://docs.ros2.org/latest/api/rclcpp/classrclcpp_1_1Node.html diff --git a/extra_visitors/ros2param/src/writer.cpp b/extra_visitors/ros2param/src/writer.cpp index 522d42bf..9f0ec5ad 100644 --- a/extra_visitors/ros2param/src/writer.cpp +++ b/extra_visitors/ros2param/src/writer.cpp @@ -23,7 +23,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public ModifierImplBase + class ARILES2_VISIBILITY_PUBLIC Writer : public ModifierImplBase { public: using ModifierImplBase::ModifierImplBase; diff --git a/extra_visitors/rosparam/ariles2/visitors/rosparam.h b/extra_visitors/rosparam/ariles2/visitors/rosparam.h index a29ae17b..017f6038 100644 --- a/extra_visitors/rosparam/ariles2/visitors/rosparam.h +++ b/extra_visitors/rosparam/ariles2/visitors/rosparam.h @@ -35,7 +35,7 @@ namespace ariles2 * @brief ROS parameter server visitor. * @ingroup rosparam */ - struct ARILES2_VISIBILITY_ATTRIBUTE rosparam + struct ARILES2_VISIBILITY_PUBLIC rosparam { using Reader = ariles2::cfgread::Visitor; using Writer = ariles2::cfgwrite::Visitor; diff --git a/extra_visitors/rosparam/ariles2/visitors/rosparam/reader.h b/extra_visitors/rosparam/ariles2/visitors/rosparam/reader.h index 78896b99..4b3ae631 100644 --- a/extra_visitors/rosparam/ariles2/visitors/rosparam/reader.h +++ b/extra_visitors/rosparam/ariles2/visitors/rosparam/reader.h @@ -17,7 +17,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } @@ -25,7 +25,7 @@ namespace ariles2 /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { protected: bool startRoot(const std::string &name); diff --git a/extra_visitors/rosparam/ariles2/visitors/rosparam/writer.h b/extra_visitors/rosparam/ariles2/visitors/rosparam/writer.h index 0de743dc..bec24788 100644 --- a/extra_visitors/rosparam/ariles2/visitors/rosparam/writer.h +++ b/extra_visitors/rosparam/ariles2/visitors/rosparam/writer.h @@ -17,7 +17,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } @@ -25,7 +25,7 @@ namespace ariles2 /** * @brief Configuration writer class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const ::ros::NodeHandle &nh); diff --git a/extra_visitors/rosparam/src/common.h b/extra_visitors/rosparam/src/common.h index e31b20a6..1e4bdba5 100644 --- a/extra_visitors/rosparam/src/common.h +++ b/extra_visitors/rosparam/src/common.h @@ -23,7 +23,7 @@ namespace ariles2 { namespace ns_rosparam { - class CPPUT_LIB_LOCAL ImplBase + class ARILES2_VISIBILITY_PRIVATE ImplBase : public serialization::NodeStackBase> { public: diff --git a/extra_visitors/rosparam/src/reader.cpp b/extra_visitors/rosparam/src/reader.cpp index ca8c7e63..c73456c3 100644 --- a/extra_visitors/rosparam/src/reader.cpp +++ b/extra_visitors/rosparam/src/reader.cpp @@ -20,7 +20,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public ariles2::ns_rosparam::ImplBase + class ARILES2_VISIBILITY_PUBLIC Reader : public ariles2::ns_rosparam::ImplBase { public: std::vector iterator_stack_; diff --git a/extra_visitors/rosparam/src/writer.cpp b/extra_visitors/rosparam/src/writer.cpp index fd3decf6..f577f585 100644 --- a/extra_visitors/rosparam/src/writer.cpp +++ b/extra_visitors/rosparam/src/writer.cpp @@ -18,7 +18,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public ariles2::ns_rosparam::ImplBase + class ARILES2_VISIBILITY_PUBLIC Writer : public ariles2::ns_rosparam::ImplBase { public: explicit Writer(const ::ros::NodeHandle &nh) diff --git a/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp.h b/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp.h index a13973f0..dec3861f 100644 --- a/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp.h +++ b/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp.h @@ -38,7 +38,7 @@ namespace ariles2 * @brief YAML C++11 visitor. * @ingroup yaml_cpp */ - struct ARILES2_VISIBILITY_ATTRIBUTE yaml_cpp + struct ARILES2_VISIBILITY_PUBLIC yaml_cpp { using Reader = ariles2::cfgread::Visitor; using Writer = ariles2::cfgwrite::Visitor; diff --git a/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/reader.h b/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/reader.h index b97f6a72..7c7b973e 100644 --- a/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/reader.h +++ b/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/reader.h @@ -16,14 +16,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Reader; + class ARILES2_VISIBILITY_PUBLIC Reader; } /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::PIMPLVisitor { public: /** diff --git a/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/writer.h b/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/writer.h index 65c67c14..004b0a64 100644 --- a/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/writer.h +++ b/extra_visitors/yaml_cpp/ariles2/visitors/yaml_cpp/writer.h @@ -16,14 +16,14 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer; + class ARILES2_VISIBILITY_PUBLIC Writer; } /** * @brief Configuration reader class */ - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public serialization::PIMPLVisitor + class ARILES2_VISIBILITY_PUBLIC Writer : public serialization::PIMPLVisitor { public: explicit Writer(const std::string &file_name); diff --git a/extra_visitors/yaml_cpp/src/reader.cpp b/extra_visitors/yaml_cpp/src/reader.cpp index 978bf3af..c7b13d06 100644 --- a/extra_visitors/yaml_cpp/src/reader.cpp +++ b/extra_visitors/yaml_cpp/src/reader.cpp @@ -20,7 +20,7 @@ namespace ariles2 { namespace impl { - class Node : public serialization::Node + class ARILES2_VISIBILITY_PRIVATE Node : public serialization::Node { public: const YAML::Node node_; @@ -29,14 +29,14 @@ namespace ariles2 public: template explicit Node(const YAML::Node &node, t_Args &&...args) - : serialization::Node(std::forward(args)...), node_(node) // NOLINT + : serialization::Node(std::forward(args)...), node_(node) // NOLINT { } }; - class ARILES2_VISIBILITY_ATTRIBUTE Reader : public serialization::NodeStackBase, - public read::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Reader : public serialization::NodeStackBase, + public read::FileVisitorImplementation { public: template diff --git a/extra_visitors/yaml_cpp/src/writer.cpp b/extra_visitors/yaml_cpp/src/writer.cpp index 793d5db7..27b06e47 100644 --- a/extra_visitors/yaml_cpp/src/writer.cpp +++ b/extra_visitors/yaml_cpp/src/writer.cpp @@ -20,7 +20,7 @@ namespace ariles2 { namespace impl { - class ARILES2_VISIBILITY_ATTRIBUTE Writer : public write::FileVisitorImplementation + class ARILES2_VISIBILITY_PUBLIC Writer : public write::FileVisitorImplementation { public: /// instance of YAML emitter, is destroyed and reinitialized by flush() diff --git a/include/ariles2/adapters/basic.h b/include/ariles2/adapters/basic.h index 103b1b3a..5b6b7b7c 100644 --- a/include/ariles2/adapters/basic.h +++ b/include/ariles2/adapters/basic.h @@ -18,7 +18,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, t_Entry &entry, const typename t_Visitor::Parameters ¶meters, @@ -48,7 +48,7 @@ namespace ariles2 class t_Visitor, typename t_Enumeration, typename = std::enable_if_t::value>> - void ARILES2_VISIBILITY_ATTRIBUTE + void ARILES2_VISIBILITY_PUBLIC apply_read(t_Visitor &visitor, t_Enumeration &entry, const typename t_Visitor::Parameters & /*param*/) { CPPUT_TRACE_FUNCTION; @@ -60,7 +60,7 @@ namespace ariles2 #define ARILES2_BASIC_TYPE(type) \ template \ - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( \ + void ARILES2_VISIBILITY_PUBLIC apply_read( \ t_Visitor &visitor, type &entry, const typename t_Visitor::Parameters ¶m) \ { \ CPPUT_TRACE_FUNCTION; \ @@ -81,7 +81,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const t_Entry &entry, const typename t_Visitor::Parameters ¶meters, @@ -108,7 +108,7 @@ namespace ariles2 class t_Visitor, typename t_Enumeration, typename = std::enable_if_t::value>> - void ARILES2_VISIBILITY_ATTRIBUTE + void ARILES2_VISIBILITY_PUBLIC apply_write(t_Visitor &writer, const t_Enumeration entry, const typename t_Visitor::Parameters ¶m) { CPPUT_TRACE_FUNCTION; @@ -118,7 +118,7 @@ namespace ariles2 #define ARILES2_BASIC_TYPE(type) \ template \ - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( \ + void ARILES2_VISIBILITY_PUBLIC apply_write( \ t_Visitor &writer, const type &entry, const typename t_Visitor::Parameters ¶m) \ { \ CPPUT_TRACE_FUNCTION; \ @@ -141,7 +141,7 @@ namespace ariles2 namespace compare { template > - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const t_Left &left, const t_Right &right, @@ -160,7 +160,7 @@ namespace ariles2 class t_Visitor, typename t_Enumeration, typename = std::enable_if_t::value>> - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const t_Enumeration &left, const t_Enumeration &right, @@ -172,7 +172,7 @@ namespace ariles2 #define ARILES2_BASIC_TYPE(type) \ template \ - inline void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( \ + inline void ARILES2_VISIBILITY_PUBLIC apply_compare( \ t_Visitor &visitor, const type &left, const type &right, const typename t_Visitor::Parameters &) \ { \ visitor.equal_ &= (left == right); \ @@ -193,7 +193,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const std::complex &left, const std::complex &right, @@ -205,7 +205,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const float &left, const float &right, @@ -216,7 +216,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const double &left, const double &right, @@ -233,7 +233,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor &visitor, t_Entry &entry, const typename t_Visitor::Parameters ¶m, @@ -248,7 +248,7 @@ namespace ariles2 class t_Visitor, typename t_Enumeration, typename = std::enable_if_t::value>> - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, t_Enumeration & /*entry*/, const typename t_Visitor::Parameters & /*param*/) @@ -258,7 +258,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, std::complex &entry, const typename t_Visitor::Parameters ¶m) @@ -271,7 +271,7 @@ namespace ariles2 #define ARILES2_BASIC_TYPE(type) \ template \ - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( \ + void ARILES2_VISIBILITY_PUBLIC apply_defaults( \ const t_Visitor &, type &entry, const typename t_Visitor::Parameters ¶m) \ { \ CPPUT_TRACE_FUNCTION; \ @@ -291,7 +291,7 @@ namespace ariles2 namespace process { template - void ARILES2_VISIBILITY_ATTRIBUTE + void ARILES2_VISIBILITY_PUBLIC apply_process(const t_Visitor &visitor, t_Entry &entry, const typename t_Visitor::Parameters ¶m) { CPPUT_TRACE_FUNCTION; @@ -310,7 +310,7 @@ namespace ariles2 namespace copyfrom { template > - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &visitor, t_Left &left, const t_Right &right, @@ -326,7 +326,7 @@ namespace ariles2 #define ARILES2_BASIC_TYPE(type) \ template \ - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( \ + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( \ t_Visitor &, type &left, const type &right, const typename t_Visitor::Parameters &) \ { \ CPPUT_TRACE_FUNCTION; \ @@ -342,7 +342,7 @@ namespace ariles2 class t_Visitor, typename t_Enumeration, typename = std::enable_if_t::value>> - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &, t_Enumeration &left, const t_Enumeration &right, @@ -357,7 +357,7 @@ namespace ariles2 namespace copyto { template > - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &visitor, const t_Left &left, t_Right &right, @@ -373,7 +373,7 @@ namespace ariles2 #define ARILES2_BASIC_TYPE(type) \ template \ - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( \ + void ARILES2_VISIBILITY_PUBLIC apply_copyto( \ t_Visitor &, const type &left, type &right, const typename t_Visitor::Parameters &) \ { \ CPPUT_TRACE_FUNCTION; \ @@ -389,7 +389,7 @@ namespace ariles2 class t_Visitor, typename t_Enumeration, typename = std::enable_if_t::value>> - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &, const t_Enumeration &left, t_Enumeration &right, diff --git a/include/ariles2/adapters/generic_pointer.h b/include/ariles2/adapters/generic_pointer.h index a330c5b2..f0a33874 100644 --- a/include/ariles2/adapters/generic_pointer.h +++ b/include/ariles2/adapters/generic_pointer.h @@ -24,7 +24,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &reader, ARILES2_POINTER_TYPE &entry, const typename t_Visitor::Parameters ¶meters) @@ -51,7 +51,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const ARILES2_POINTER_TYPE &entry, const typename t_Visitor::Parameters ¶m) @@ -76,7 +76,7 @@ namespace ariles2 namespace compare { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const ARILES2_POINTER_TYPE &left, const ARILES2_POINTER_TYPE &right, @@ -111,7 +111,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, ARILES2_POINTER_TYPE &entry, const typename t_Visitor::Parameters & /*param*/) @@ -128,7 +128,7 @@ namespace ariles2 namespace process { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_process( + void ARILES2_VISIBILITY_PUBLIC apply_process( const t_Visitor &visitor, ARILES2_POINTER_TYPE &entry, const typename t_Visitor::Parameters ¶m) @@ -148,7 +148,7 @@ namespace ariles2 namespace copyfrom { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &visitor, ARILES2_POINTER_TYPE &left, const ARILES2_POINTER_TYPE &right, @@ -178,7 +178,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &visitor, ARILES2_POINTER_TYPE &left, const ARILES2_POINTER_TYPE &right, @@ -219,7 +219,7 @@ namespace ariles2 namespace copyto { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &visitor, const ARILES2_POINTER_TYPE &left, ARILES2_POINTER_TYPE &right, @@ -249,7 +249,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &visitor, const ARILES2_POINTER_TYPE &left, ARILES2_POINTER_TYPE &right, diff --git a/include/ariles2/adapters/pointer.h b/include/ariles2/adapters/pointer.h index db29599a..8b75c9ab 100644 --- a/include/ariles2/adapters/pointer.h +++ b/include/ariles2/adapters/pointer.h @@ -16,7 +16,7 @@ namespace ariles2 { template - class ARILES2_VISIBILITY_ATTRIBUTE PointerHandler> + class ARILES2_VISIBILITY_PUBLIC PointerHandler> { public: using Pointer = std::shared_ptr; @@ -42,7 +42,7 @@ namespace ariles2 template - class ARILES2_VISIBILITY_ATTRIBUTE PointerHandler> + class ARILES2_VISIBILITY_PUBLIC PointerHandler> { public: using Pointer = std::unique_ptr; diff --git a/include/ariles2/adapters/std_map.h b/include/ariles2/adapters/std_map.h index 6d9641ec..7feac796 100644 --- a/include/ariles2/adapters/std_map.h +++ b/include/ariles2/adapters/std_map.h @@ -32,7 +32,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE + void ARILES2_VISIBILITY_PUBLIC apply_read(t_Visitor &visitor, std::map &entry, const typename t_Visitor::Parameters ¶m) { CPPUT_TRACE_FUNCTION; @@ -52,7 +52,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, std::map &entry, const typename t_Visitor::Parameters ¶meters) @@ -83,7 +83,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const std::map &entry, const typename t_Visitor::Parameters ¶m) @@ -99,7 +99,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const std::map &entry, const typename t_Visitor::Parameters ¶m) @@ -130,7 +130,7 @@ namespace ariles2 namespace compare { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const std::map &left, const std::map &right, @@ -159,7 +159,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, std::map &entry, const typename t_Visitor::Parameters & /*param*/) @@ -176,7 +176,7 @@ namespace ariles2 namespace process { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_process( + void ARILES2_VISIBILITY_PUBLIC apply_process( const t_Visitor &visitor, std::map &entry, const typename t_Visitor::Parameters ¶m) @@ -197,7 +197,7 @@ namespace ariles2 namespace copyfrom { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &visitor, std::map &left, const std::map &right, @@ -223,7 +223,7 @@ namespace ariles2 namespace copyto { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &visitor, const std::map &left, std::map &right, diff --git a/include/ariles2/adapters/std_pair.h b/include/ariles2/adapters/std_pair.h index f2cdf9bc..b994c560 100644 --- a/include/ariles2/adapters/std_pair.h +++ b/include/ariles2/adapters/std_pair.h @@ -19,7 +19,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, std::pair &entry, const typename t_Visitor::Parameters ¶meters) @@ -33,7 +33,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, std::pair &entry, const typename t_Visitor::Parameters ¶meters) @@ -63,7 +63,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const std::pair &entry, const typename t_Visitor::Parameters ¶m) @@ -78,7 +78,7 @@ namespace ariles2 template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const std::pair &entry, const typename t_Visitor::Parameters ¶m) @@ -112,7 +112,7 @@ namespace ariles2 namespace compare { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const std::pair &left, const std::pair &right, @@ -133,7 +133,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor &visitor, std::pair &entry, const typename t_Visitor::Parameters ¶m) @@ -152,7 +152,7 @@ namespace ariles2 namespace process { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_process( + void ARILES2_VISIBILITY_PUBLIC apply_process( const t_Visitor &visitor, std::pair &entry, const typename t_Visitor::Parameters ¶m) @@ -175,7 +175,7 @@ namespace ariles2 typename t_SecondLeft, typename t_FirstRight, typename t_SecondRight> - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &visitor, std::pair &left, const std::pair &right, @@ -196,7 +196,7 @@ namespace ariles2 typename t_SecondLeft, typename t_FirstRight, typename t_SecondRight> - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &visitor, const std::pair &left, std::pair &right, diff --git a/include/ariles2/adapters/std_vector.h b/include/ariles2/adapters/std_vector.h index 0569c7b0..42a01119 100644 --- a/include/ariles2/adapters/std_vector.h +++ b/include/ariles2/adapters/std_vector.h @@ -29,7 +29,7 @@ namespace ariles2 namespace read { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, std::vector &entry, const typename t_Visitor::Parameters ¶m) @@ -44,7 +44,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_read( + void ARILES2_VISIBILITY_PUBLIC apply_read( t_Visitor &visitor, std::vector &entry, const typename t_Visitor::Parameters ¶m) @@ -68,7 +68,7 @@ namespace ariles2 namespace write { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_write( + void ARILES2_VISIBILITY_PUBLIC apply_write( t_Visitor &writer, const std::vector &entry, const typename t_Visitor::Parameters ¶m) @@ -90,7 +90,7 @@ namespace ariles2 namespace compare { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_compare( + void ARILES2_VISIBILITY_PUBLIC apply_compare( t_Visitor &visitor, const std::vector &left, const std::vector &right, @@ -114,7 +114,7 @@ namespace ariles2 namespace defaults { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_defaults( + void ARILES2_VISIBILITY_PUBLIC apply_defaults( const t_Visitor & /*visitor*/, std::vector &entry, const typename t_Visitor::Parameters & /*param*/) @@ -132,7 +132,7 @@ namespace ariles2 namespace process { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_process( + void ARILES2_VISIBILITY_PUBLIC apply_process( const t_Visitor &visitor, std::vector &entry, const typename t_Visitor::Parameters ¶m) @@ -145,7 +145,7 @@ namespace ariles2 } template - void ARILES2_VISIBILITY_ATTRIBUTE apply_process( + void ARILES2_VISIBILITY_PUBLIC apply_process( const t_Visitor &visitor, std::vector &entry, const typename t_Visitor::Parameters ¶m) @@ -167,7 +167,7 @@ namespace ariles2 namespace copyfrom { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyfrom( + void ARILES2_VISIBILITY_PUBLIC apply_copyfrom( t_Visitor &visitor, std::vector &left, const std::vector &right, @@ -190,7 +190,7 @@ namespace ariles2 namespace copyto { template - void ARILES2_VISIBILITY_ATTRIBUTE apply_copyto( + void ARILES2_VISIBILITY_PUBLIC apply_copyto( t_Visitor &visitor, const std::vector &left, std::vector &right, diff --git a/include/ariles2/ariles.h b/include/ariles2/ariles.h index 40b11157..83da6400 100644 --- a/include/ariles2/ariles.h +++ b/include/ariles2/ariles.h @@ -61,9 +61,9 @@ namespace ariles2 { - class ARILES2_VISIBILITY_ATTRIBUTE DefaultBase : public ariles2::Ariles + class ARILES2_VISIBILITY_PUBLIC DefaultBase : public ariles2::Ariles # define ARILES2_VISITOR(visitor) , public ariles2::visitor::Base - ARILES2_DEFAULT_VISITORS + ARILES2_DEFAULT_VISITORS # undef ARILES2_VISITOR { protected: @@ -89,7 +89,7 @@ namespace ariles2 namespace ariles2 { // Some classes may inherit from this - class ARILES2_VISIBILITY_ATTRIBUTE DefaultBase + class ARILES2_VISIBILITY_PUBLIC DefaultBase { protected: /** diff --git a/include/ariles2/extra.h b/include/ariles2/extra.h index d0b9896f..c842c4e9 100644 --- a/include/ariles2/extra.h +++ b/include/ariles2/extra.h @@ -22,7 +22,7 @@ namespace ariles2 namespace parameters { template - class SloppyMixin : public t_Parameters + class ARILES2_VISIBILITY_PUBLIC SloppyMixin : public t_Parameters { public: SloppyMixin() @@ -33,7 +33,7 @@ namespace ariles2 }; template - class RelaxedMixin : public t_Parameters + class ARILES2_VISIBILITY_PUBLIC RelaxedMixin : public t_Parameters { public: RelaxedMixin() @@ -43,7 +43,7 @@ namespace ariles2 }; template - class NonFlatMatricesMixin : public t_Parameters + class ARILES2_VISIBILITY_PUBLIC NonFlatMatricesMixin : public t_Parameters { public: NonFlatMatricesMixin() @@ -55,7 +55,7 @@ namespace ariles2 template - class NonDefaultBaseTemplate : public DefaultBase + class ARILES2_VISIBILITY_PUBLIC NonDefaultBaseTemplate : public DefaultBase { public: using DefaultBase::arilesGetParameters; diff --git a/include/ariles2/internal/helpers.h b/include/ariles2/internal/helpers.h index 7ef0c626..642cfb1b 100644 --- a/include/ariles2/internal/helpers.h +++ b/include/ariles2/internal/helpers.h @@ -73,10 +73,7 @@ ARILES2_BASIC_TYPE(std::string) -#ifndef ARILES2_VISIBILITY_ATTRIBUTE -# include "visibility.h" -# define ARILES2_VISIBILITY_ATTRIBUTE CPPUT_LIB_EXPORT -#endif +#include "visibility.h" // #define CPPUT_TRACE_ENABLE @@ -87,7 +84,7 @@ namespace ariles2 { // intentionally not defined template - class ARILES2_VISIBILITY_ATTRIBUTE PointerHandler; + class ARILES2_VISIBILITY_PUBLIC PointerHandler; template @@ -97,7 +94,7 @@ namespace ariles2 } - class ARILES2_VISIBILITY_ATTRIBUTE Ariles + class ARILES2_VISIBILITY_PUBLIC Ariles { protected: ~Ariles() diff --git a/include/ariles2/internal/trace.h b/include/ariles2/internal/trace.h index 6490b9c7..18cfa108 100644 --- a/include/ariles2/internal/trace.h +++ b/include/ariles2/internal/trace.h @@ -26,16 +26,12 @@ # define CPPUT_TRACE_FUNCTION_NAME __func__ # endif -# ifndef CPPUT_VISIBILITY_ATTRIBUTE -# include "visibility.h" -# define CPPUT_VISIBILITY_ATTRIBUTE CPPUT_LIB_LOCAL -# endif namespace cpput { namespace trace { - class CPPUT_VISIBILITY_ATTRIBUTE Tracer + class ARILES2_VISIBILITY_PRIVATE Tracer { public: std::string tabulation_; diff --git a/include/ariles2/internal/visibility.h b/include/ariles2/internal/visibility.h index 6c3635b8..15212353 100644 --- a/include/ariles2/internal/visibility.h +++ b/include/ariles2/internal/visibility.h @@ -10,35 +10,35 @@ #pragma once -#ifndef H_CPPUT_VISIBILITY -# define H_CPPUT_VISIBILITY +#ifndef H_ARILES_VISIBILITY +# define H_ARILES_VISIBILITY # if defined _WIN32 || defined __CYGWIN__ -# define CPPUT_LIB_IMPORT __declspec(dllimport) -# define CPPUT_LIB_EXPORT __declspec(dllexport) -# define CPPUT_LIB_LOCAL +# define ARILES2_VISIBILITY_IMPORT __declspec(dllimport) +# define ARILES2_VISIBILITY_PUBLIC __declspec(dllexport) +# define ARILES2_VISIBILITY_PRIVATE # else # if __GNUC__ >= 4 -# define CPPUT_LIB_IMPORT __attribute__((visibility("default"))) -# define CPPUT_LIB_EXPORT __attribute__((visibility("default"))) -# define CPPUT_LIB_LOCAL __attribute__((visibility("hidden"))) +# define ARILES2_VISIBILITY_IMPORT __attribute__((visibility("default"))) +# define ARILES2_VISIBILITY_PUBLIC __attribute__((visibility("default"))) +# define ARILES2_VISIBILITY_PRIVATE __attribute__((visibility("hidden"))) # else -# define CPPUT_LIB_IMPORT -# define CPPUT_LIB_EXPORT -# define CPPUT_LIB_LOCAL +# define ARILES2_VISIBILITY_IMPORT +# define ARILES2_VISIBILITY_PUBLIC +# define ARILES2_VISIBILITY_PRIVATE # endif # endif # ifdef CPPUT_COMPILE_SHARED_LIB // compiled as a shared library (the default) -# define CPPUT_LOCAL CPPUT_LIB_LOCAL +# define CPPUT_LOCAL ARILES2_VISIBILITY_PRIVATE # ifdef CPPUT_IMPORT_LIB // this apparently makes sense only in WIN -# define CPPUT_API CPPUT_LIB_IMPORT +# define CPPUT_API ARILES2_VISIBILITY_IMPORT # else -# define CPPUT_API CPPUT_LIB_EXPORT +# define CPPUT_API ARILES2_VISIBILITY_PUBLIC # endif # else // compiled as a static library diff --git a/include/ariles2/types.h b/include/ariles2/types.h index f496951f..31b36a1f 100644 --- a/include/ariles2/types.h +++ b/include/ariles2/types.h @@ -13,7 +13,7 @@ namespace ariles2 { template