Skip to content

Fix start_time shadow variable #2114

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

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Fix start_time shadow variable #2114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions httplib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3365,7 +3365,7 @@ class SocketStream final : public Stream {
time_t write_timeout_sec_;
time_t write_timeout_usec_;
time_t max_timeout_msec_;
const std::chrono::time_point<std::chrono::steady_clock> start_time;
const std::chrono::time_point<std::chrono::steady_clock> start_time_;

std::vector<char> read_buff_;
size_t read_buff_off_ = 0;
Expand Down Expand Up @@ -3403,7 +3403,7 @@ class SSLSocketStream final : public Stream {
time_t write_timeout_sec_;
time_t write_timeout_usec_;
time_t max_timeout_msec_;
const std::chrono::time_point<std::chrono::steady_clock> start_time;
const std::chrono::time_point<std::chrono::steady_clock> start_time_;
};
#endif

Expand Down Expand Up @@ -6060,7 +6060,7 @@ inline SocketStream::SocketStream(
read_timeout_usec_(read_timeout_usec),
write_timeout_sec_(write_timeout_sec),
write_timeout_usec_(write_timeout_usec),
max_timeout_msec_(max_timeout_msec), start_time(start_time),
max_timeout_msec_(max_timeout_msec), start_time_(start_time),
read_buff_(read_buff_size_, 0) {}

inline SocketStream::~SocketStream() = default;
Expand Down Expand Up @@ -6158,7 +6158,7 @@ inline socket_t SocketStream::socket() const { return sock_; }

inline time_t SocketStream::duration() const {
return std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::steady_clock::now() - start_time)
std::chrono::steady_clock::now() - start_time_)
.count();
}

Expand Down Expand Up @@ -9200,7 +9200,7 @@ inline SSLSocketStream::SSLSocketStream(
read_timeout_usec_(read_timeout_usec),
write_timeout_sec_(write_timeout_sec),
write_timeout_usec_(write_timeout_usec),
max_timeout_msec_(max_timeout_msec), start_time(start_time) {
max_timeout_msec_(max_timeout_msec), start_time_(start_time) {
SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
}

Expand Down Expand Up @@ -9306,7 +9306,7 @@ inline socket_t SSLSocketStream::socket() const { return sock_; }

inline time_t SSLSocketStream::duration() const {
return std::chrono::duration_cast<std::chrono::milliseconds>(
std::chrono::steady_clock::now() - start_time)
std::chrono::steady_clock::now() - start_time_)
.count();
}

Expand Down