From c4047f6f112594bb819170ae77471a56aaf5efef Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 25 Jul 2014 09:52:20 +1000 Subject: [PATCH] AP_Terrain: rename find_grid() to find_grid_cache() thanks Randy! --- libraries/AP_Terrain/AP_Terrain.cpp | 2 +- libraries/AP_Terrain/AP_Terrain.h | 2 +- libraries/AP_Terrain/TerrainGCS.cpp | 2 +- libraries/AP_Terrain/TerrainUtil.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Terrain/AP_Terrain.cpp b/libraries/AP_Terrain/AP_Terrain.cpp index e658dfc691..1290084df4 100644 --- a/libraries/AP_Terrain/AP_Terrain.cpp +++ b/libraries/AP_Terrain/AP_Terrain.cpp @@ -94,7 +94,7 @@ bool AP_Terrain::height_amsl(const Location &loc, float &height) calculate_grid_info(loc, info); // find the grid - const struct grid_block &grid = find_grid(info).grid; + const struct grid_block &grid = find_grid_cache(info).grid; /* note that we rely on the one square overlap to ensure these diff --git a/libraries/AP_Terrain/AP_Terrain.h b/libraries/AP_Terrain/AP_Terrain.h index 7f19372892..04547df901 100644 --- a/libraries/AP_Terrain/AP_Terrain.h +++ b/libraries/AP_Terrain/AP_Terrain.h @@ -253,7 +253,7 @@ private: /* find a grid structure given a grid_info */ - struct grid_cache &find_grid(const struct grid_info &info); + struct grid_cache &find_grid_cache(const struct grid_info &info); /* calculate bit number in grid_block bitmap. This corresponds to a diff --git a/libraries/AP_Terrain/TerrainGCS.cpp b/libraries/AP_Terrain/TerrainGCS.cpp index 8f996d4556..545da2da68 100644 --- a/libraries/AP_Terrain/TerrainGCS.cpp +++ b/libraries/AP_Terrain/TerrainGCS.cpp @@ -65,7 +65,7 @@ bool AP_Terrain::request_missing(mavlink_channel_t chan, struct grid_cache &gcac bool AP_Terrain::request_missing(mavlink_channel_t chan, const struct grid_info &info) { // find the grid - struct grid_cache &gcache = find_grid(info); + struct grid_cache &gcache = find_grid_cache(info); return request_missing(chan, gcache); } diff --git a/libraries/AP_Terrain/TerrainUtil.cpp b/libraries/AP_Terrain/TerrainUtil.cpp index 2c3c11fbbe..7e716af50d 100644 --- a/libraries/AP_Terrain/TerrainUtil.cpp +++ b/libraries/AP_Terrain/TerrainUtil.cpp @@ -115,7 +115,7 @@ void AP_Terrain::calculate_grid_info(const Location &loc, struct grid_info &info /* find a grid structure given a grid_info */ -AP_Terrain::grid_cache &AP_Terrain::find_grid(const struct grid_info &info) +AP_Terrain::grid_cache &AP_Terrain::find_grid_cache(const struct grid_info &info) { uint16_t oldest_i = 0;