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

Commit c90e2a4

Browse files
katmsftvinjiang
authored andcommitted
Fixed some build issue on VS2013 and modified the build script for Jenkins.
1 parent 81c6d45 commit c90e2a4

File tree

5 files changed

+11
-4
lines changed

5 files changed

+11
-4
lines changed

Microsoft.WindowsAzure.Storage/Microsoft.WindowsAzure.Storage.v120.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@
202202
<ClInclude Include="resource.h" />
203203
</ItemGroup>
204204
<ItemGroup>
205+
<ClCompile Include="src\executor.cpp" />
205206
<ClCompile Include="src\cloud_append_blob.cpp" />
206207
<ClCompile Include="src\cloud_common.cpp" />
207208
<ClCompile Include="src\timer_handler.cpp" />

Microsoft.WindowsAzure.Storage/includes/wascore/executor.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,13 @@ namespace azure { namespace storage { namespace core {
168168
}
169169
}
170170

171+
#if defined(_MSC_VER) && _MSC_VER < 1900
172+
173+
// Prevents the compiler from generating default assignment operator.
174+
storage_command_base& operator=(storage_command_base& other) = delete;
175+
176+
#endif
177+
171178
void set_request_body(istream_descriptor value)
172179
{
173180
m_request_body = value;

Microsoft.WindowsAzure.Storage/src/cloud_blob.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ namespace azure { namespace storage {
267267
{
268268
blob_request_options modified_options(options);
269269
modified_options.apply_defaults(service_client().default_request_options(), blob_type::unspecified);
270-
std::chrono::time_point<std::chrono::steady_clock> first_time_point;
270+
std::chrono::steady_clock::time_point first_time_point;
271271

272272
if (options.is_maximum_execution_time_customized())
273273
{

Microsoft.WindowsAzure.Storage/src/cloud_blob_container.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ namespace azure { namespace storage {
306306
{
307307
blob_request_options modified_options(options);
308308
modified_options.apply_defaults(service_client().default_request_options(), blob_type::unspecified);
309-
std::chrono::time_point<std::chrono::steady_clock> first_time_point;
309+
std::chrono::steady_clock::time_point first_time_point;
310310

311311
if (modified_options.is_maximum_execution_time_customized())
312312
{
@@ -376,7 +376,7 @@ namespace azure { namespace storage {
376376
{
377377
blob_request_options modified_options(options);
378378
modified_options.apply_defaults(service_client().default_request_options(), blob_type::unspecified);
379-
std::chrono::time_point<std::chrono::steady_clock> first_time_point;
379+
std::chrono::steady_clock::time_point first_time_point;
380380

381381
if (options.is_maximum_execution_time_customized())
382382
{

Microsoft.WindowsAzure.Storage/tests/cloud_append_blob_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1133,7 +1133,6 @@ SUITE(Blob)
11331133
fill_buffer_and_get_md5(buffer);
11341134
{
11351135
auto options = azure::storage::blob_request_options();
1136-
options.set_maximum_execution_time(std::chrono::milliseconds(200));
11371136
options.set_maximum_execution_time(std::chrono::milliseconds(10));
11381137
auto cancel_token_src = pplx::cancellation_token_source();
11391138

0 commit comments

Comments
 (0)