Merge branch 'master' into devel

Author: nim65s

cmake

@@ -62,6 +62,6 @@ load classes of entities  and create instances of entities.</p>
 \li Type-safe connection of input and output signals
 \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
-systems\n 
+systems\n
 
 */

doc/additionalDoc/introduction.h

@@ -266,9 +266,9 @@ class Logger {
 
   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.
-   *  \note If \p m is a stream type, the internal counter associated to \p lineId
-   *        is updated.
+  /** Check whether a message of type \p m and from \p c lineId should be
+   * accepted. \note If \p m is a stream type, the internal counter associated
+   * to \p lineId is updated.
    */
   bool acceptMsg(MsgType m, const std::string &lineId) {
     // If more verbose than the current verbosity level

include/dynamic-graph/logger.h

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>dynamic-graph</name>
-  <version>4.2.1</version>
+  <version>4.2.2</version>
   <description>
     Dynamic graph library
   </description>

package.xml

@@ -64,7 +64,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
   bool res = false;
   try {
     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) {
     output << aea.getExceptionName();
     output2 << aea.what();
@@ -79,7 +80,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
   res = false;
   try {
     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) {
     res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
   }
@@ -90,7 +92,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
   res = false;
   try {
     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) {
     res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
   }
@@ -101,7 +104,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
   res = false;
   try {
     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) {
     res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
   }
@@ -112,7 +116,8 @@ BOOST_AUTO_TEST_CASE(value_exceptions) {
   res = false;
   try {
     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) {
     res = (aea.getCode() == dg::ExceptionAbstract::TOOLS);
   }