diff options
| author | Martin Ridgers <[email protected]> | 2021-11-01 10:12:38 +0100 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-11-01 10:13:57 +0100 |
| commit | 9897f5317f7848893bf05f3036deacca326e3135 (patch) | |
| tree | 4f64f8fa3e4b6b9035e2d08983ddaa32d27060c4 /zenserver/projectstore.cpp | |
| parent | Removed unused variable (diff) | |
| download | zen-9897f5317f7848893bf05f3036deacca326e3135.tar.xz zen-9897f5317f7848893bf05f3036deacca326e3135.zip | |
Fixed up some assumptions that satd::fs::path uses wchar_t
Diffstat (limited to 'zenserver/projectstore.cpp')
| -rw-r--r-- | zenserver/projectstore.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 3f6320fd0..ba51a0dd2 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -117,7 +117,7 @@ struct ProjectStore::OplogStorage : public RefCounted #if USE_ROCKSDB { - std::string RocksdbPath = WideToUtf8((m_OplogStoragePath / "ops.rdb").native().c_str()); + std::string RocksdbPath = ToUtf8(m_OplogStoragePath / "ops.rdb"); ZEN_DEBUG("opening rocksdb db at '{}'", RocksdbPath); @@ -629,7 +629,7 @@ ProjectStore::Project::Write() CbObjectWriter Cfg; Cfg << "id" << Identifier; - Cfg << "root" << WideToUtf8(RootDir.c_str()); + Cfg << "root" << ToUtf8(RootDir); Cfg << "project" << ProjectRootDir; Cfg << "engine" << EngineRootDir; @@ -1491,7 +1491,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) ProjectStore::Oplog& Log = *OplogIt; CbObjectWriter Cb; - Cb << "id"sv << Log.OplogId() << "project"sv << Prj.Identifier << "tempdir"sv << Log.TempDir(); + Cb << "id"sv << Log.OplogId() << "project"sv << Prj.Identifier << "tempdir"sv << Log.TempPath().c_str(); Req.ServerRequest().WriteResponse(HttpResponseCode::OK, Cb.Save()); } @@ -1630,7 +1630,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) const ProjectStore::Project& Prj = *ProjectIt; CbObjectWriter Response; - Response << "id" << Prj.Identifier << "root" << WideToUtf8(Prj.RootDir.c_str()); + Response << "id" << Prj.Identifier << "root" << ToUtf8(Prj.RootDir); Response.BeginArray("oplogs"sv); Prj.IterateOplogs([&](const ProjectStore::Oplog& I) { Response << "id"sv << I.OplogId(); }); |