From 9086231f3923c0df6d9ef817441bfae5e134e8ff Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 12:07:03 +0100 Subject: Converted use of _format UDL to fmt::format --- zenserver/projectstore.cpp | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'zenserver/projectstore.cpp') diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 4f9897e07..8221199f1 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -42,8 +42,6 @@ ZEN_THIRD_PARTY_INCLUDES_END namespace zen { -using namespace fmt::literals; - #if USE_ROCKSDB namespace rocksdb = ROCKSDB_NAMESPACE; #endif @@ -154,14 +152,14 @@ struct ProjectStore::OplogStorage : public RefCounted } else { - throw std::runtime_error("column family iteration failed for '{}': '{}'"_format(RocksdbPath, Status.getState()).c_str()); + throw std::runtime_error(fmt::format("column family iteration failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str()); } Status = rocksdb::DB::Open(Options, RocksdbPath, ColumnDescriptors, &m_RocksDbColumnHandles, &Db); if (!Status.ok()) { - throw std::runtime_error("database open failed for '{}': '{}'"_format(RocksdbPath, Status.getState()).c_str()); + throw std::runtime_error(fmt::format("database open failed for '{}': '{}'", RocksdbPath, Status.getState()).c_str()); } m_RocksDb.reset(Db); @@ -1560,7 +1558,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) if (!legacy::TryLoadCbPackage(Package, Payload, &UniqueBuffer::Alloc, &Resolver)) { std::filesystem::path BadPackagePath = - Oplog.TempPath() / "bad_packages" / "session{}_request{}"_format(HttpReq.SessionId(), HttpReq.RequestId()); + Oplog.TempPath() / "bad_packages" / fmt::format("session{}_request{}", HttpReq.SessionId(), HttpReq.RequestId()); ZEN_ERROR("Received malformed package! Saving payload to '{}'", BadPackagePath); @@ -1609,8 +1607,6 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) }, HttpVerb::kGet); - using namespace fmt::literals; - m_Router.RegisterRoute( "{project}/oplog/{log}", [this](HttpRouterRequest& Req) { @@ -1623,7 +1619,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, - "project {} not found"_format(ProjectId)); + fmt::format("project {} not found", ProjectId)); } ProjectStore::Project& Prj = *ProjectIt; @@ -1638,7 +1634,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, - "oplog {} not found in project {}"_format(OplogId, ProjectId)); + fmt::format("oplog {} not found in project {}", OplogId, ProjectId)); } ProjectStore::Oplog& Log = *OplogIt; @@ -1777,7 +1773,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, - "project {} not found"_format(ProjectId)); + fmt::format("project {} not found", ProjectId)); } const ProjectStore::Project& Prj = *ProjectIt; @@ -1801,7 +1797,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) { return Req.ServerRequest().WriteResponse(HttpResponseCode::NotFound, HttpContentType::kText, - "project {} not found"_format(ProjectId)); + fmt::format("project {} not found", ProjectId)); } m_ProjectStore->DeleteProject(ProjectId); @@ -2142,7 +2138,6 @@ LocalProjectService::~LocalProjectService() TEST_CASE("prj.store") { - using namespace fmt::literals; using namespace std::literals; ScopedTemporaryDirectory TempDir; -- cgit v1.2.3 From de7410c27c36d84b34860bb0d6015f7ee23c780d Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Mon, 10 Jan 2022 13:21:30 +0100 Subject: Unused lambda capture compile error --- zenserver/projectstore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zenserver/projectstore.cpp') diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 8221199f1..42d785126 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -1598,7 +1598,7 @@ HttpProjectService::HttpProjectService(CidStore& Store, ProjectStore* Projects) m_Router.RegisterRoute( "{project}/oplog/{log}/{op}", - [this](HttpRouterRequest& Req) { + [](HttpRouterRequest& Req) { HttpServerRequest& HttpReq = Req.ServerRequest(); // TODO: look up op and respond with the payload! -- cgit v1.2.3