Skip to content

Commit 9e40058

Browse files
committed
Replacing tabs with spaces.
1 parent 39f3cf6 commit 9e40058

File tree

5 files changed

+36
-40
lines changed

5 files changed

+36
-40
lines changed

Release/include/cpprest/http_client.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -196,24 +196,24 @@ class http_client_config
196196
return std::chrono::duration_cast<utility::seconds>(m_timeout);
197197
}
198198

199-
/// <summary>
200-
/// Get the timeout
201-
/// </summary>
202-
/// <returns>The timeout (in whatever duration) used for each send and receive operation on the client.</returns>
203-
template <class T>
204-
T timeout() const
205-
{
206-
return std::chrono::duration_cast<T>(m_timeout);
207-
}
208-
/// <summary>
209-
/// Set the timeout
210-
/// </summary>
211-
/// <param name="timeout">The timeout (duration from microseconds range and up) used for each send and receive operation on the client.</param>
212-
template <class T>
213-
void set_timeout(const T &timeout)
214-
{
215-
m_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
216-
}
199+
/// <summary>
200+
/// Get the timeout
201+
/// </summary>
202+
/// <returns>The timeout (in whatever duration) used for each send and receive operation on the client.</returns>
203+
template <class T>
204+
T timeout() const
205+
{
206+
return std::chrono::duration_cast<T>(m_timeout);
207+
}
208+
/// <summary>
209+
/// Set the timeout
210+
/// </summary>
211+
/// <param name="timeout">The timeout (duration from microseconds range and up) used for each send and receive operation on the client.</param>
212+
template <class T>
213+
void set_timeout(const T &timeout)
214+
{
215+
m_timeout = std::chrono::duration_cast<std::chrono::microseconds>(timeout);
216+
}
217217

218218
/// <summary>
219219
/// Get the client chunk size.

Release/src/http/client/http_client_winhttp.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -395,11 +395,9 @@ class winhttp_client : public _http_client_communicator
395395
}
396396

397397
// Set timeouts.
398-
int milliseconds = static_cast<int>(
399-
std::chrono::duration_cast<std::chrono::milliseconds>(config.timeout()).count()
400-
);
401-
milliseconds = std::max<decltype(milliseconds)>(milliseconds, 1);
402-
if(!WinHttpSetTimeouts(m_hSession,
398+
int milliseconds = static_cast<int>(std::chrono::duration_cast<std::chrono::milliseconds>(config.timeout()).count());
399+
milliseconds = std::max<decltype(milliseconds)>(milliseconds, 1);
400+
if (!WinHttpSetTimeouts(m_hSession,
403401
milliseconds,
404402
milliseconds,
405403
milliseconds,

Release/src/http/client/http_client_winrt.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,10 +463,8 @@ class winrt_client : public _http_client_communicator
463463
}
464464

465465
// Set timeout.
466-
ULONGLONG timeout = static_cast<ULONGLONG>(
467-
std::chrono::duration_cast<std::chrono::milliseconds>(config.timeout()).count()
468-
);
469-
timeout = std::max<decltype(timeout)>(timeout, std::numeric_limits<decltype(timeout)>::min() + 1);
466+
ULONGLONG timeout = static_cast<ULONGLONG>(std::chrono::duration_cast<std::chrono::milliseconds>(config.timeout()).count());
467+
timeout = std::max<decltype(timeout)>(timeout, std::numeric_limits<decltype(timeout)>::min() + 1);
470468
hr = winrt_context->m_hRequest->SetProperty(XHR_PROP_TIMEOUT, timeout);
471469
if (FAILED(hr))
472470
{

Release/tests/functional/http/client/client_construction.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,13 @@ TEST_FIXTURE(uri_address, get_client_config)
172172

173173
const http_client_config& config2 = client.client_config();
174174
VERIFY_ARE_EQUAL(config2.timeout().count(), timeout.count());
175-
std::chrono::milliseconds milli_timeout = config2.timeout();
176-
VERIFY_ARE_EQUAL(milli_timeout.count(),
177-
std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count());
178-
auto micro_timeout = config.timeout<std::chrono::microseconds>();
179-
VERIFY_ARE_EQUAL(micro_timeout.count(),
180-
std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
181-
175+
std::chrono::milliseconds milli_timeout = config2.timeout();
176+
VERIFY_ARE_EQUAL(milli_timeout.count(),
177+
std::chrono::duration_cast<std::chrono::milliseconds>(timeout).count());
178+
auto micro_timeout = config.timeout<std::chrono::microseconds>();
179+
VERIFY_ARE_EQUAL(micro_timeout.count(),
180+
std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
181+
182182
VERIFY_ARE_EQUAL(config2.chunksize(), 1024);
183183
}
184184

Release/tests/functional/http/client/connections_and_errors.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,13 @@ TEST_FIXTURE(uri_address, request_timeout)
142142
#ifdef _WIN32 // winhttp client
143143
TEST_FIXTURE(uri_address, winhttp_request_timeout)
144144
{
145-
test_http_server::scoped_server scoped(m_uri);
146-
http_client_config config;
147-
config.set_timeout(std::chrono::microseconds(500));
145+
test_http_server::scoped_server scoped(m_uri);
146+
http_client_config config;
147+
config.set_timeout(std::chrono::microseconds(500));
148148

149-
http_client client(m_uri, config);
150-
auto responseTask = client.request(methods::GET);
151-
VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::timed_out);
149+
http_client client(m_uri, config);
150+
auto responseTask = client.request(methods::GET);
151+
VERIFY_THROWS_HTTP_ERROR_CODE(responseTask.get(), std::errc::timed_out);
152152
}
153153
#endif
154154

0 commit comments

Comments
 (0)