]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/cppmicroservices/fix-warning-c4834.patch
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / cppmicroservices / fix-warning-c4834.patch
CommitLineData
1e59de90
TL
1diff --git a/httpservice/src/ServletContainer.cpp b/httpservice/src/ServletContainer.cpp\r
2index b4af8c9..8713066 100644\r
3--- a/httpservice/src/ServletContainer.cpp\r
4+++ b/httpservice/src/ServletContainer.cpp\r
5@@ -279,7 +279,9 @@ void ServletContainer::SetContextPath(const std::string& path)\r
6 \r
7 std::string ServletContainer::GetContextPath() const\r
8 {\r
9- return Lock(d->m_Mutex), d->m_ContextPath;\r
10+ Lock l(d->m_Mutex);\r
11+ US_UNUSED(l);\r
12+ return d->m_ContextPath;\r
13 }\r
14 \r
15 void ServletContainer::Start()\r
16@@ -306,6 +308,8 @@ std::shared_ptr<ServletContext> ServletContainer::GetContext(\r
17 std::string ServletContainer::GetContextPath(\r
18 const ServletContext* /*context*/) const\r
19 {\r
20- return Lock(d->m_Mutex), d->m_ContextPath;\r
21+ Lock l(d->m_Mutex);\r
22+ US_UNUSED(l);\r
23+ return d->m_ContextPath;\r
24 }\r
25 }\r