Commit 53a7bbf8 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

Merge branch 'master' into devel

parents 7ad3c601 3f6d48d0
Pipeline #10192 passed with stage
in 3 minutes and 54 seconds
Subproject commit 6a173d2e8f35f1052a6ca383a729470783aa7893 Subproject commit fb4c22c319ec5320f9a85527eb1a4130954846f5
...@@ -62,6 +62,6 @@ load classes of entities and create instances of entities.</p> ...@@ -62,6 +62,6 @@ load classes of entities and create instances of entities.</p>
\li Type-safe connection of input and output signals \li Type-safe connection of input and output signals
\li On-demand signal computation as well as a caching system for signal values \li On-demand signal computation as well as a caching system for signal values
allow fast computation of signal values, which is a critical point for real-time allow fast computation of signal values, which is a critical point for real-time
systems\n systems\n
*/ */
...@@ -266,9 +266,9 @@ protected: ...@@ -266,9 +266,9 @@ protected:
inline bool isStreamMsg(MsgType m) { return (m & MSG_TYPE_STREAM_BIT); } inline bool isStreamMsg(MsgType m) { return (m & MSG_TYPE_STREAM_BIT); }
/** Check whether a message of type \p m and from \p c lineId should be accepted. /** Check whether a message of type \p m and from \p c lineId should be
* \note If \p m is a stream type, the internal counter associated to \p lineId * accepted. \note If \p m is a stream type, the internal counter associated
* is updated. * to \p lineId is updated.
*/ */
bool acceptMsg(MsgType m, const std::string &lineId) { bool acceptMsg(MsgType m, const std::string &lineId) {
// If more verbose than the current verbosity level // If more verbose than the current verbosity level
......
<?xml version="1.0"?> <?xml version="1.0"?>
<package format="3"> <package format="3">
<name>dynamic-graph</name> <name>dynamic-graph</name>
<version>4.2.1</version> <version>4.2.2</version>
<description> <description>
Dynamic graph library Dynamic graph library
</description> </description>
......
...@@ -64,7 +64,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) { ...@@ -64,7 +64,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
bool res = false; bool res = false;
try { try {
int aInt(anet); int aInt(anet);
aInt++; // silence unused variable warnings to have a stable release in the ros buildfarm aInt++; // silence unused variable warnings to have a stable release in the
// ros buildfarm
} catch (const dg::ExceptionAbstract &aea) { } catch (const dg::ExceptionAbstract &aea) {
output << aea.getExceptionName(); output << aea.getExceptionName();
output2 << aea.what(); output2 << aea.what();
...@@ -79,7 +80,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) { ...@@ -79,7 +80,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
res = false; res = false;
try { try {
bool abool(anet); bool abool(anet);
abool=!abool; // silence unused variable warnings to have a stable release in the ros buildfarm abool = !abool; // silence unused variable warnings to have a stable release
// in the ros buildfarm
} catch (const dg::ExceptionAbstract &aea) { } catch (const dg::ExceptionAbstract &aea) {
res = (aea.getCode() == dg::ExceptionAbstract::TOOLS); res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
} }
...@@ -90,7 +92,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) { ...@@ -90,7 +92,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
res = false; res = false;
try { try {
unsigned int aint(anet); unsigned int aint(anet);
aint++; // silence unused variable warnings to have a stable release in the ros buildfarm aint++; // silence unused variable warnings to have a stable release in the
// ros buildfarm
} catch (const dg::ExceptionAbstract &aea) { } catch (const dg::ExceptionAbstract &aea) {
res = (aea.getCode() == dg::ExceptionAbstract::TOOLS); res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
} }
...@@ -101,7 +104,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) { ...@@ -101,7 +104,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
res = false; res = false;
try { try {
double adouble(anet); double adouble(anet);
adouble++; // silence unused variable warnings to have a stable release in the ros buildfarm adouble++; // silence unused variable warnings to have a stable release in
// the ros buildfarm
} catch (const dg::ExceptionAbstract &aea) { } catch (const dg::ExceptionAbstract &aea) {
res = (aea.getCode() == dg::ExceptionAbstract::TOOLS); res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
} }
...@@ -112,7 +116,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) { ...@@ -112,7 +116,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
res = false; res = false;
try { try {
float afloat(anet); float afloat(anet);
afloat++; // silence unused variable warnings to have a stable release in the ros buildfarm afloat++; // silence unused variable warnings to have a stable release in
// the ros buildfarm
} catch (const dg::ExceptionAbstract &aea) { } catch (const dg::ExceptionAbstract &aea) {
res = (aea.getCode() == dg::ExceptionAbstract::TOOLS); res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment