[Fawkes Git] branch/vmatare/cpp-namespaces: created (0.5.0-3083-g1429d7f)

Victor Mataré matare at lih.rwth-aachen.de
Sat Apr 23 02:23:27 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, vmatare/cpp-namespaces has been created
        at  1429d7f404b4ee2a6e3a2ac1a6c6db1712bf1d81 (commit)

http://git.fawkesrobotics.org/fawkes.git/vmatare/cpp-namespaces

- *Log* ---------------------------------------------------------------
commit 4c9c84966731aeb578613cd12951cfc05f208ccd
Author:     Victor Mataré <matare at lih.rwth-aachen.de>
AuthorDate: Sat Apr 23 02:22:26 2016 +0200
Commit:     Victor Mataré <matare at lih.rwth-aachen.de>
CommitDate: Sat Apr 23 02:22:26 2016 +0200

    gazebo: fix <cmath> namespace usage

http://git.fawkesrobotics.org/fawkes.git/commit/4c9c849
http://trac.fawkesrobotics.org/changeset/4c9c849

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit 1429d7f404b4ee2a6e3a2ac1a6c6db1712bf1d81
Author:     Victor Mataré <matare at lih.rwth-aachen.de>
AuthorDate: Sat Apr 23 02:22:59 2016 +0200
Commit:     Victor Mataré <matare at lih.rwth-aachen.de>
CommitDate: Sat Apr 23 02:22:59 2016 +0200

    colli: fix <cmath> namespace usage

http://git.fawkesrobotics.org/fawkes.git/commit/1429d7f
http://trac.fawkesrobotics.org/changeset/1429d7f

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/plugins/colli/search/og_laser.cpp     |    2 +-
 src/plugins/colli/utils/rob/roboshape.cpp |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 4c9c84966731aeb578613cd12951cfc05f208ccd - - - - - - - - - -
Author:  Victor Mataré <matare at lih.rwth-aachen.de>
Date:    Sat Apr 23 02:22:26 2016 +0200
Subject: gazebo: fix <cmath> namespace usage

 .../gazsim_vis_localization_thread.cpp             |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/gazebo/gazsim-vis-localization/gazsim_vis_localization_thread.cpp b/src/plugins/gazebo/gazsim-vis-localization/gazsim_vis_localization_thread.cpp
index 7076edc..347f203 100644
--- a/src/plugins/gazebo/gazsim-vis-localization/gazsim_vis_localization_thread.cpp
+++ b/src/plugins/gazebo/gazsim-vis-localization/gazsim_vis_localization_thread.cpp
@@ -22,7 +22,7 @@
 
 #include <tf/types.h>
 #include <stdio.h>
-#include <math.h>
+#include <cmath>
 #include <utils/math/angle.h>
 
 #include <interfaces/Position3DInterface.h>
@@ -92,7 +92,7 @@ void VisLocalizationThread::loop()
     //calculate ori from quaternion in interface
     double* quat = pose_if_->rotation();
     double ori = tf::get_yaw(tf::Quaternion(quat[0], quat[1], quat[2], quat[3]));
-    if(isnan(ori))
+    if(std::isnan(ori))
     {
       ori = 0.0;
     }

- *commit* 1429d7f404b4ee2a6e3a2ac1a6c6db1712bf1d81 - - - - - - - - - -
Author:  Victor Mataré <matare at lih.rwth-aachen.de>
Date:    Sat Apr 23 02:22:59 2016 +0200
Subject: colli: fix <cmath> namespace usage

 src/plugins/colli/search/og_laser.cpp     |    2 +-
 src/plugins/colli/utils/rob/roboshape.cpp |   18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/colli/search/og_laser.cpp b/src/plugins/colli/search/og_laser.cpp
index f0c3098..e4750d9 100644
--- a/src/plugins/colli/search/og_laser.cpp
+++ b/src/plugins/colli/search/og_laser.cpp
@@ -296,7 +296,7 @@ LaserOccupancyGrid::validate_old_laser_points(cart_coord_2d_t pos_robot, cart_co
 
     // angle a between to vectors v,w: cos(a) = dot(v,w) / (|v|*|w|)
     angle = acos( (v_old.x*v_new.x + v_old.y*v_new.y) / (d_new*d_old) );
-    if( isnan(angle) || angle > deg_unit ) {
+    if( std::isnan(angle) || angle > deg_unit ) {
       // p_old is not the range of this laser-beam. Keep it.
       old_readings_tmp.push_back( *it );
 
diff --git a/src/plugins/colli/utils/rob/roboshape.cpp b/src/plugins/colli/utils/rob/roboshape.cpp
index 8a7c8cd..cb5bce4 100644
--- a/src/plugins/colli/utils/rob/roboshape.cpp
+++ b/src/plugins/colli/utils/rob/roboshape.cpp
@@ -59,15 +59,15 @@ RoboShape::RoboShape( const char * cfg_prefix,
   width_add_front_ = width_add_back_ = HUGE_VAL;
   width_add_right_ = width_add_left_ = HUGE_VAL;
 
-  if( (isinf(laser_offset_x_) )
-   && (isinf(laser_offset_y_) )
-   && (isinf(radius_) )
-   && (isinf(width_x_) )
-   && (isinf(width_y_) )
-   && (isinf(width_add_left_) )
-   && (isinf(width_add_right_) )
-   && (isinf(width_add_front_) )
-   && (isinf(width_add_back_) ) ) {
+  if( (std::isinf(laser_offset_x_) )
+   && (std::isinf(laser_offset_y_) )
+   && (std::isinf(radius_) )
+   && (std::isinf(width_x_) )
+   && (std::isinf(width_y_) )
+   && (std::isinf(width_add_left_) )
+   && (std::isinf(width_add_right_) )
+   && (std::isinf(width_add_front_) )
+   && (std::isinf(width_add_back_) ) ) {
     // go on, everything is fine, cause all are infinity
 
   } else {




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list