Skip to content

Commit 22f5135

Browse files
authored
Update vcpkg SHA (#5772)
1 parent 1143b6b commit 22f5135

4 files changed

Lines changed: 42 additions & 3 deletions

File tree

cmake-modules/AzureVcpkg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ macro(az_vcpkg_integrate)
1818
message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
1919
# GET VCPKG FROM SOURCE
2020
# User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
21-
set(VCPKG_COMMIT_STRING f61a294e765b257926ae9e9d85f96468a0af74e7) # default SDK tested commit
21+
set(VCPKG_COMMIT_STRING 5312e9f976e89b256954f571433e34f783dd2d12) # default SDK tested commit
2222
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
2323
message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
2424
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit

sdk/core/azure-core-tracing-opentelemetry/src/opentelemetry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ namespace Azure { namespace Core { namespace Tracing { namespace OpenTelemetry {
232232
{
233233
return header.Value();
234234
}
235-
return std::string();
235+
return {};
236236
}
237237

238238
/** @brief Sets the value of an HTTP header in the request.

sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,28 @@ void InitTracer(const std::string& stressScenarioName)
9090
auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
9191

9292
auto resource{GetTraceResource(stressScenarioName)};
93+
94+
#if defined(_MSC_VER)
95+
#pragma warning(push)
96+
#pragma warning(disable : 4996)
97+
#elif defined(__clang__)
98+
#pragma clang diagnostic push
99+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
100+
#elif defined(__GNUC__)
101+
#pragma GCC diagnostic push
102+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
103+
#endif
104+
// https://github.com/Azure/azure-sdk-for-cpp/issues/5784
105+
93106
std::shared_ptr<opentelemetry::trace::TracerProvider> provider
94107
= trace_sdk::TracerProviderFactory::Create(std::move(processor), std::move(resource));
108+
#ifdef _MSC_VER
109+
#pragma warning(pop)
110+
#elif defined(__clang__)
111+
#pragma clang diagnostic pop
112+
#elif defined(__GNUC__)
113+
#pragma GCC diagnostic pop
114+
#endif
95115

96116
// Set the global trace provider
97117
trace::Provider::SetTracerProvider(provider);
@@ -181,8 +201,27 @@ void InitLogger(const std::string& stressScenarioName)
181201

182202
auto resource{GetTraceResource(stressScenarioName)};
183203

204+
#if defined(_MSC_VER)
205+
#pragma warning(push)
206+
#pragma warning(disable : 4996)
207+
#elif defined(__clang__)
208+
#pragma clang diagnostic push
209+
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
210+
#elif defined(__GNUC__)
211+
#pragma GCC diagnostic push
212+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
213+
#endif
214+
// https://github.com/Azure/azure-sdk-for-cpp/issues/5784
215+
184216
std::shared_ptr<logs::LoggerProvider> provider
185217
= logs_sdk::LoggerProviderFactory::Create(std::move(processor), std::move(resource));
218+
#ifdef _MSC_VER
219+
#pragma warning(pop)
220+
#elif defined(__clang__)
221+
#pragma clang diagnostic pop
222+
#elif defined(__GNUC__)
223+
#pragma GCC diagnostic pop
224+
#endif
186225

187226
// Set the global log provider.
188227
logs::Provider::SetLoggerProvider(provider);

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "azure-sdk-for-cpp",
33
"version": "1.5.0",
4-
"builtin-baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",
4+
"builtin-baseline": "5312e9f976e89b256954f571433e34f783dd2d12",
55
"dependencies": [
66
{
77
"name": "curl"

0 commit comments

Comments
 (0)