Skip to content

Commit

Permalink
Bump to 2.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
asherikov committed Jul 22, 2024
1 parent e2748ad commit d4e31f1
Show file tree
Hide file tree
Showing 34 changed files with 122 additions and 19 deletions.
8 changes: 8 additions & 0 deletions ariles/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
CHANGELOG
=========

2.3.2
=====

Fixed
-----
* std::vector<bool> support


2.3.1
=====

Expand Down
2 changes: 1 addition & 1 deletion ariles/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# General parameters
cmake_minimum_required (VERSION 3.5.0)
project(ariles2 VERSION 2.3.1)
project(ariles2 VERSION 2.3.2)


set(ARILES_HOMEPAGE http://asherikov.github.io/ariles/2)
Expand Down
32 changes: 32 additions & 0 deletions ariles/include/ariles2/adapters/std_vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,23 @@ namespace ariles2
}
visitor.endArray();
}

template <class t_Visitor, class... t_Args>
void ARILES2_VISIBILITY_ATTRIBUTE apply_read(
t_Visitor &visitor,
std::vector<bool, t_Args...> &entry,
const typename t_Visitor::Parameters &param)
{
CPPUT_TRACE_FUNCTION;
entry.resize(visitor.startArray());
for (std::size_t i = 0; i < entry.size(); ++i)
{
bool value;
visitor.visitArrayElement(value, param);
entry[i] = value;
}
visitor.endArray();
}
} // namespace read
} // namespace ariles2

Expand Down Expand Up @@ -126,6 +143,21 @@ namespace ariles2
apply_process(visitor, value, param);
}
}

template <class t_Visitor, class... t_Args>
void ARILES2_VISIBILITY_ATTRIBUTE apply_process(
const t_Visitor &visitor,
std::vector<bool, t_Args...> &entry,
const typename t_Visitor::Parameters &param)
{
CPPUT_TRACE_FUNCTION;
for (std::size_t i = 0; i < entry.size(); ++i)
{
bool value = entry[i];
apply_process(visitor, value, param);
entry[i] = value;
}
}
} // namespace process
} // namespace ariles2

Expand Down
10 changes: 10 additions & 0 deletions ariles/tests/api_v2/regression_test_226.ref
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,16 @@ ariles_std_vector_3[label="std_vector_3"];
ariles_std_vector->ariles_std_vector_3;
ariles_std_vector_4[label="std_vector_4"];
ariles_std_vector->ariles_std_vector_4;
ariles_std_vector_bool[label="std_vector_bool"];
ariles->ariles_std_vector_bool;
ariles_std_vector_bool_0[label="std_vector_bool_0"];
ariles_std_vector_bool->ariles_std_vector_bool_0;
ariles_std_vector_bool_1[label="std_vector_bool_1"];
ariles_std_vector_bool->ariles_std_vector_bool_1;
ariles_std_vector_bool_2[label="std_vector_bool_2"];
ariles_std_vector_bool->ariles_std_vector_bool_2;
ariles_std_vector_bool_3[label="std_vector_bool_3"];
ariles_std_vector_bool->ariles_std_vector_bool_3;
ariles_std_nested_vector[label="std_nested_vector"];
ariles->ariles_std_nested_vector;
ariles_std_nested_vector_0[label="std_nested_vector_0"];
Expand Down
1 change: 1 addition & 0 deletions ariles/tests/api_v2/types/complex_auto_declare.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace ariles_tests
ARILES2_TYPED_ENTRY_(v, complex_float, std::complex<float>) \
ARILES2_TYPED_ENTRY_(v, string, std::string) \
ARILES2_TYPED_ENTRY_(v, std_vector, std::vector<double>) \
ARILES2_TYPED_ENTRY_(v, std_vector_bool, std::vector<bool>) \
ARILES2_TYPED_ENTRY_(v, std_nested_vector, std::vector<std::vector<double>>) \
ARILES2_TYPED_ENTRY_(v, some_enum, SomeEnum) \
ARILES2_TYPED_ENTRY_(v, boolean_true, bool) \
Expand Down
9 changes: 9 additions & 0 deletions ariles/tests/api_v2/types/complex_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ namespace ariles_tests
impl->std_vector_[i] = i * 5.22 + 2.3;
}

impl->std_vector_bool_ = {false, false, true, false};

impl->std_nested_vector_.resize(3);
for (std::size_t i = 0; i < impl->std_nested_vector_.size(); ++i)
{
Expand Down Expand Up @@ -131,6 +133,8 @@ namespace ariles_tests
impl->std_vector_[i] = GET_RANDOM_REAL;
}

impl->std_vector_bool_ = {false, true, false};

impl->std_nested_vector_.resize(3);
for (std::size_t i = 0; i < impl->std_nested_vector_.size(); ++i)
{
Expand Down Expand Up @@ -221,13 +225,18 @@ namespace ariles_tests
BOOST_CHECK_EQUAL(configurable_out.better_enum_, configurable_in.better_enum_);

BOOST_CHECK_EQUAL(configurable_out.std_vector_.size(), configurable_in.std_vector_.size());
BOOST_CHECK_EQUAL(configurable_out.std_vector_bool_.size(), configurable_in.std_vector_bool_.size());
BOOST_CHECK_EQUAL(configurable_out.std_nested_vector_.size(), configurable_in.std_nested_vector_.size());

for (std::size_t i = 0; i < configurable_out.std_vector_.size(); ++i)
{
BOOST_CHECK_CLOSE(configurable_out.std_vector_[i], configurable_in.std_vector_[i], g_tolerance);
}

for (std::size_t i = 0; i < configurable_out.std_vector_bool_.size(); ++i)
{
BOOST_CHECK_EQUAL(configurable_out.std_vector_bool_[i], configurable_in.std_vector_bool_[i]);
}

for (std::size_t i = 0; i < configurable_out.std_nested_vector_.size(); ++i)
{
Expand Down
2 changes: 2 additions & 0 deletions ariles/tests/api_v2/types/complex_verbose.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace ariles_tests
ARILES2_ENTRY_(v, complex_float) \
ARILES2_ENTRY_(v, string) \
ARILES2_ENTRY_(v, std_vector) \
ARILES2_ENTRY_(v, std_vector_bool) \
ARILES2_ENTRY_(v, std_nested_vector) \
ARILES2_ENTRY_(v, some_enum) \
ARILES2_ENTRY_(v, boolean_true) \
Expand Down Expand Up @@ -71,6 +72,7 @@ namespace ariles_tests


std::vector<double> std_vector_;
std::vector<bool> std_vector_bool_;
std::vector<std::vector<double>> std_nested_vector_;

std::string string_;
Expand Down
1 change: 1 addition & 0 deletions ariles/tests/api_v2/types/copy/complex.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ namespace ariles_tests


std::vector<double> std_vector;
std::vector<bool> std_vector_bool;
std::vector<std::vector<double>> std_nested_vector;

std::string string;
Expand Down
5 changes: 5 additions & 0 deletions ariles2_core_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_core_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_core_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_core_ws VERSION 2.3.1)
project(ariles2_core_ws VERSION 2.3.2)

option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)

Expand Down
2 changes: 1 addition & 1 deletion ariles2_core_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_core_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (core module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_graphviz_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_graphviz_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_graphviz_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_graphviz_ws VERSION 2.3.1)
project(ariles2_graphviz_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_graphviz_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_graphviz_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (graphviz module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
2 changes: 1 addition & 1 deletion ariles2_namevalue2_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_namevalue2_ws VERSION 2.3.1)
project(ariles2_namevalue2_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_namevalue2_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_namevalue2_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (namevalue2 module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_octave_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_octave_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_octave_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_octave_ws VERSION 2.3.1)
project(ariles2_octave_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_octave_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_octave_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (octave module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_pugixml_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_pugixml_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_pugixml_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_pugixml_ws VERSION 2.3.1)
project(ariles2_pugixml_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_pugixml_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_pugixml_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (PugiXML module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_rapidjson_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_rapidjson_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_rapidjson_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_rapidjson_ws VERSION 2.3.1)
project(ariles2_rapidjson_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_rapidjson_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_rapidjson_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (RapidJSON module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_ros2param_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_ros2param_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_ros2param_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_ros2param_ws VERSION 2.3.1)
project(ariles2_ros2param_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_ros2param_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_ros2param_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (ros2param module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_rosparam_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_rosparam_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_rosparam_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_rosparam_ws VERSION 2.3.1)
project(ariles2_rosparam_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_rosparam_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_rosparam_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (rosparam module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions ariles2_yamlcpp_ws/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package ariles2_yamlcpp_ws
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

2.3.2 (2024-07-22)
------------------

- See https://github.com/asherikov/ariles/blob/head_2/CHANGELOG.md

2.3.1 (2024-07-21)
------------------

Expand Down
2 changes: 1 addition & 1 deletion ariles2_yamlcpp_ws/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
project(ariles2_yamlcpp_ws VERSION 2.3.1)
project(ariles2_yamlcpp_ws VERSION 2.3.2)


option(ARILES_ROS_ENABLE_TESTS "Enable tests." OFF)
Expand Down
2 changes: 1 addition & 1 deletion ariles2_yamlcpp_ws/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package format="2">
<name>ariles2_yamlcpp_ws</name>
<version>2.3.1</version>
<version>2.3.2</version>
<description>Ariles serialization/configuration library (yaml-cpp module)</description>

<maintainer email="asherikov@yandex.com">Alexander Sherikov</maintainer>
Expand Down

0 comments on commit d4e31f1

Please sign in to comment.