Fix path => string.

karnkaul · Jan 10, 2024 · 97c93f0 · 97c93f0
1 parent b692b09
commit 97c93f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/lib/src/data_store.cpp b/lib/src/data_store.cpp
@@ -48,7 +48,7 @@ auto DataStore::make_full_path(std::string_view uri) const -> std::string { retu
 
 auto DataStore::make_uri(std::string_view const full_path) const -> std::string {
 	if (full_path.empty()) { return {}; }
-	return fs::path{full_path}.lexically_relative(get_mount_point());
+	return fs::path{full_path}.lexically_relative(get_mount_point()).generic_string();
 }
 
 auto DataStore::to_spir_v(std::string_view const glsl) const -> std::string {

diff --git a/tools/src/tools/applet.cpp b/tools/src/tools/applet.cpp
@@ -113,7 +113,7 @@ auto Applet::save_json(dj::Json const& json, std::string_view uri) const -> bool
 }
 
 auto Applet::format_title(std::string_view name, std::string_view uri, bool unsaved) -> std::string {
-	auto ret = std::format("{}{}", unsaved ? "*" : "", name);
+	auto ret = fmt::format("{}{}", unsaved ? "*" : "", name);
 	if (!uri.empty()) { fmt::format_to(std::back_inserter(ret), " - {}", uri); }
 	return ret;
 }

diff --git a/tools/src/tools/tiler.cpp b/tools/src/tools/tiler.cpp
@@ -1,5 +1,6 @@
 #include <bave/json_io.hpp>
 #include <tools/tiler.hpp>
+#include <algorithm>
 #include <filesystem>
 
 namespace bave::tools {