Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explicit type conversion from std::chrono::milliseconds to long #450

Merged
merged 3 commits into from
Jan 5, 2021
Merged

Add explicit type conversion from std::chrono::milliseconds to long #450

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
621394c
Add explicit type conversion from std::chrono::milliseconds to long
ThomsonTan Dec 14, 2020
730ecfc
Use C++ style type conversion instead of C style
ThomsonTan Dec 18, 2020
33f5d3b
Merge branch 'master' into FixChronoType
lalitb Jan 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ext/include/opentelemetry/ext/http/client/curl/http_operation_curl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class HttpOperation

/* wait for the socket to become ready for sending */
sockfd_ = sockextr;
if (!WaitOnSocket(sockfd_, 0, http_conn_timeout_.count()) || is_aborted_)
if (!WaitOnSocket(sockfd_, 0, static_cast<long>(http_conn_timeout_.count())) || is_aborted_)
{
res_ = CURLE_OPERATION_TIMEDOUT;
DispatchEvent(
Expand Down Expand Up @@ -414,8 +414,6 @@ class HttpOperation
// Socket parameters
curl_socket_t sockfd_;

// long sockextr_ = 0;

curl_off_t nread_;
size_t sendlen_ = 0; // # bytes sent by client
size_t acklen_ = 0; // # bytes ack by server
Expand Down