Merge branch 'main' into wait_for_quiescencewait_for_quiescence

1 files changed, 8 insertions, 13 deletions

diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 4f9897e07..42d785126 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);
 
@@ -1600,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!
@@ -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;