From 9fd7bfc1b59da95f560a6763cd076ba8270a9875 Mon Sep 17 00:00:00 2001 From: Vaclav Blazek Date: Tue, 3 Sep 2019 18:53:37 +0200 Subject: [PATCH] made compilable on gcc 4.9 (o jessie...) --- externals/buildsys/cmake | 2 +- externals/libmath | 2 +- externals/libsemantic | 2 +- mapproxy/src/mapproxy/generator/geodata-semantic-tiled.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/externals/buildsys/cmake b/externals/buildsys/cmake index 2780d51..4cff7a6 160000 --- a/externals/buildsys/cmake +++ b/externals/buildsys/cmake @@ -1 +1 @@ -Subproject commit 2780d513c282627346599181539eb9f97ba9a23e +Subproject commit 4cff7a6fec20c3a00d62062ab1e4f9a958a2177b diff --git a/externals/libmath b/externals/libmath index 083ad0e..ce94cf9 160000 --- a/externals/libmath +++ b/externals/libmath @@ -1 +1 @@ -Subproject commit 083ad0eed0487e55fc2cd9497039ac069331b77d +Subproject commit ce94cf957964c328b178bc00cee38f62be119d56 diff --git a/externals/libsemantic b/externals/libsemantic index 1b429b5..821f3e6 160000 --- a/externals/libsemantic +++ b/externals/libsemantic @@ -1 +1 @@ -Subproject commit 1b429b517948f7bce4ed3e0957b8e6b943dfaf4b +Subproject commit 821f3e61c0a4718bea380c96dc5938b2702bee8c diff --git a/mapproxy/src/mapproxy/generator/geodata-semantic-tiled.cpp b/mapproxy/src/mapproxy/generator/geodata-semantic-tiled.cpp index 85f6132..9e34a30 100644 --- a/mapproxy/src/mapproxy/generator/geodata-semantic-tiled.cpp +++ b/mapproxy/src/mapproxy/generator/geodata-semantic-tiled.cpp @@ -514,7 +514,7 @@ class SemanticJob : public WorkRequest { static const semantic::GeoPackage& openDataset(const std::string &path) { auto fcache(cache_.find(path)); if (fcache != cache_.end()) { return fcache->second; } - return cache_.emplace(path, path).first->second; + return cache_.emplace(path, fs::path(path)).first->second; } MemoryBlock *rawTile_;