From b1f9e2afa4ed7aef36134530015e45d75e2545e9 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Mon, 6 Feb 2017 15:43:55 +0200
Subject: [PATCH] laser-filters: backport fix for missing std namespace

Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
---
 ...01-Use-std-namespace-for-c-11-compat.patch | 45 +++++++++++++++++++
 .../laser-filters/laser-filters_1.8.3.bb      |  4 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 recipes-ros/laser-filters/laser-filters/0001-Use-std-namespace-for-c-11-compat.patch

diff --git a/recipes-ros/laser-filters/laser-filters/0001-Use-std-namespace-for-c-11-compat.patch b/recipes-ros/laser-filters/laser-filters/0001-Use-std-namespace-for-c-11-compat.patch
new file mode 100644
index 0000000..5a06ff6
--- /dev/null
+++ b/recipes-ros/laser-filters/laser-filters/0001-Use-std-namespace-for-c-11-compat.patch
@@ -0,0 +1,45 @@
+From 9631aaabd65e10615baebd30273b57677ba4d49c Mon Sep 17 00:00:00 2001
+From: Mike Purvis <mpurvis@clearpathrobotics.com>
+Date: Fri, 15 Jul 2016 23:47:45 -0400
+Subject: [PATCH] Use std:: namespace for c++11 compat.
+
+Upstream-Status: Backported
+
+---
+ include/laser_filters/intensity_filter.h | 4 ++--
+ test/test_scan_filter_chain.cpp          | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/include/laser_filters/intensity_filter.h b/include/laser_filters/intensity_filter.h
+index 3f175a0..4c9cfbc 100644
+--- a/include/laser_filters/intensity_filter.h
++++ b/include/laser_filters/intensity_filter.h
+@@ -99,8 +99,8 @@ public:
+       // Calculate histogram
+       if (disp_hist_enabled_){
+         // If intensity value is inf or NaN, skip voting histogram
+-        if( isinf((double)filtered_scan.intensities[i]) ||
+-            isnan((double)filtered_scan.intensities[i]) )
++        if( std::isinf((double)filtered_scan.intensities[i]) ||
++            std::isnan((double)filtered_scan.intensities[i]) )
+           continue;
+ 
+         // Choose bucket to vote on histogram,
+diff --git a/test/test_scan_filter_chain.cpp b/test/test_scan_filter_chain.cpp
+index b661f5f..139da60 100644
+--- a/test/test_scan_filter_chain.cpp
++++ b/test/test_scan_filter_chain.cpp
+@@ -60,8 +60,8 @@ sensor_msgs::LaserScan gen_msg(){
+  */
+ void expect_ranges_eq(const std::vector<float> &a, const std::vector<float> &b) {
+   for( int i=0; i<10; i++) {
+-    if(isnan(a[i])) {
+-      EXPECT_TRUE(isnan(a[i]));
++    if(std::isnan(a[i])) {
++      EXPECT_TRUE(std::isnan(a[i]));
+     }
+     else {
+       EXPECT_NEAR(a[i], b[i], 1e-6);
+-- 
+2.7.4
+
diff --git a/recipes-ros/laser-filters/laser-filters_1.8.3.bb b/recipes-ros/laser-filters/laser-filters_1.8.3.bb
index 0bad22e..4ef00ff 100644
--- a/recipes-ros/laser-filters/laser-filters_1.8.3.bb
+++ b/recipes-ros/laser-filters/laser-filters_1.8.3.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9de
 
 DEPENDS = "angles filters laser-geometry message-filters pluginlib roscpp sensor-msgs tf"
 
-SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz \
+           file://0001-Use-std-namespace-for-c-11-compat.patch \
+           "
 SRC_URI[md5sum] = "566b4a51d0d11522d7528ca437c42b0f"
 SRC_URI[sha256sum] = "3e124b474c0c0da419366fa21a101874cc7e4c83b352a2da5a21e1967c68555f"