Merge pull request #1409 from RockLobster/develop

FIX: Moved the GeometryCompressor's free_list_maximum into a member variable of the class.
This commit is contained in:
Dennis Luxen
2015-03-05 14:02:34 +01:00
2 changed files with 3 additions and 2 deletions
+1 -2
View File
@@ -35,8 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <limits> #include <limits>
#include <string> #include <string>
int free_list_maximum = 0; //int UniqueNumber() { return ++free_list_maximum; }
int UniqueNumber() { return ++free_list_maximum; }
GeometryCompressor::GeometryCompressor() GeometryCompressor::GeometryCompressor()
{ {
+2
View File
@@ -58,6 +58,8 @@ class GeometryCompressor
NodeID GetLastNodeIDOfBucket(const EdgeID edge_id) const; NodeID GetLastNodeIDOfBucket(const EdgeID edge_id) const;
private: private:
int free_list_maximum = 0;
void IncreaseFreeList(); void IncreaseFreeList();
std::vector<std::vector<CompressedNode>> m_compressed_geometries; std::vector<std::vector<CompressedNode>> m_compressed_geometries;
std::vector<unsigned> m_free_list; std::vector<unsigned> m_free_list;