summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2017-08-23 09:03:18 +0200
committerAlexis Ballier <aballier@gentoo.org>2017-08-23 09:30:37 +0200
commitb971d8812605a9a459f650f7c3e54e784d8a67e5 (patch)
treef4a7e73973de20bda5427919ff3880112f4ddc97 /dev-ros/amcl/files
parentros-meta/navigation: Remove old (diff)
downloadgentoo-b971d8812605a9a459f650f7c3e54e784d8a67e5.tar.gz
gentoo-b971d8812605a9a459f650f7c3e54e784d8a67e5.tar.bz2
gentoo-b971d8812605a9a459f650f7c3e54e784d8a67e5.zip
dev-ros/amcl: Remove old
Package-Manager: Portage-2.3.8, Repoman-2.3.3
Diffstat (limited to 'dev-ros/amcl/files')
-rw-r--r--dev-ros/amcl/files/gcc7.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/dev-ros/amcl/files/gcc7.patch b/dev-ros/amcl/files/gcc7.patch
deleted file mode 100644
index 12c19bbdd671..000000000000
--- a/dev-ros/amcl/files/gcc7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 65261a83e7269906f726f14d7e8cc30e5f9901f0
-Author: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
-Date: Fri Jun 16 14:50:52 2017 +0300
-
- amcl: fix compilation with gcc v7
-
- When building amcl with recent enough gcc v7 compilation fails with
- the error
-
- src/amcl/map/map_cspace.cpp: In function 'void enqueue(map_t*, unsigned int, unsigned int, unsigned int, unsigned int, std::priority_queue<CellData>&, CachedDistanceMap*, unsigned char*)':
- src/amcl/map/map_cspace.cpp:98:34: error: call of overloaded 'abs(unsigned int)' is ambiguous
- unsigned int di = abs(i - src_i);
-
- Use `int abs(int)` flavour of the abs() function.
-
-diff --git a/amcl/src/amcl/map/map_cspace.cpp b/amcl/src/amcl/map/map_cspace.cpp
-index 421f718..5b4cf9c 100644
---- a/amcl/src/amcl/map/map_cspace.cpp
-+++ b/amcl/src/amcl/map/map_cspace.cpp
-@@ -86,8 +86,8 @@ get_distance_map(double scale, double max_dist)
- return cdm;
- }
-
--void enqueue(map_t* map, unsigned int i, unsigned int j,
-- unsigned int src_i, unsigned int src_j,
-+void enqueue(map_t* map, int i, int j,
-+ int src_i, int src_j,
- std::priority_queue<CellData>& Q,
- CachedDistanceMap* cdm,
- unsigned char* marked)
-@@ -95,8 +95,8 @@ void enqueue(map_t* map, unsigned int i, unsigned int j,
- if(marked[MAP_INDEX(map, i, j)])
- return;
-
-- unsigned int di = abs(i - src_i);
-- unsigned int dj = abs(j - src_j);
-+ int di = abs(i - src_i);
-+ int dj = abs(j - src_j);
- double distance = cdm->distances_[di][dj];
-
- if(distance > cdm->cell_radius_)