Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit 132989c

Browse files
Jinming-Huvinjiang
authored andcommitted
Remove conditional compilation for get_wastorage_ambient_scheduler()
1 parent e097b31 commit 132989c

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

Microsoft.WindowsAzure.Storage/includes/was/core.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,21 +1498,11 @@ namespace azure { namespace storage {
14981498
/// </summary>
14991499
WASTORAGE_API void __cdecl set_wastorage_ambient_scheduler(const std::shared_ptr<pplx::scheduler_interface>& scheduler);
15001500

1501-
#if defined(_MSC_VER) && _MSC_VER < 1900
1502-
15031501
/// <summary>
15041502
/// Gets the ambient scheduler to be used by the PPL constructs. Note this is not thread safe.
15051503
/// </summary>
15061504
WASTORAGE_API const std::shared_ptr<pplx::scheduler_interface> __cdecl get_wastorage_ambient_scheduler();
15071505

1508-
#else
1509-
1510-
/// <summary>
1511-
/// Gets the ambient scheduler to be used by the PPL constructs. Note this is not thread safe.
1512-
/// </summary>
1513-
WASTORAGE_API const std::shared_ptr<pplx::scheduler_interface>& __cdecl get_wastorage_ambient_scheduler();
1514-
1515-
#endif
15161506
/// <summary>
15171507
/// Sets the ambient scheduler to be used for scheduling delayed tasks. Note this is not thread safe.
15181508
/// </summary>

Microsoft.WindowsAzure.Storage/src/cloud_core.cpp

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,10 @@ namespace azure { namespace storage {
6868
pplx::set_ambient_scheduler(scheduler);
6969
}
7070

71-
#if defined(_MSC_VER) && _MSC_VER < 1900
72-
73-
const std::shared_ptr<pplx::scheduler_interface> __cdecl get_wastorage_ambient_scheduler()
74-
{
75-
return pplx::get_ambient_scheduler();
76-
}
77-
78-
#else
79-
80-
const std::shared_ptr<pplx::scheduler_interface>& __cdecl get_wastorage_ambient_scheduler()
81-
{
82-
return pplx::get_ambient_scheduler();
83-
}
84-
85-
#endif
71+
const std::shared_ptr<pplx::scheduler_interface> __cdecl get_wastorage_ambient_scheduler()
72+
{
73+
return pplx::get_ambient_scheduler();
74+
}
8675

8776
void __cdecl set_wastorage_ambient_delayed_scheduler(const std::shared_ptr<delayed_scheduler_interface>& scheduler)
8877
{

0 commit comments

Comments
 (0)