Skip to content

Commit 65ce51a

Browse files
authored
Fix start_time shadow variable (yhirose#2114)
1 parent 787a34a commit 65ce51a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

httplib.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -3365,7 +3365,7 @@ class SocketStream final : public Stream {
33653365
time_t write_timeout_sec_;
33663366
time_t write_timeout_usec_;
33673367
time_t max_timeout_msec_;
3368-
const std::chrono::time_point<std::chrono::steady_clock> start_time;
3368+
const std::chrono::time_point<std::chrono::steady_clock> start_time_;
33693369

33703370
std::vector<char> read_buff_;
33713371
size_t read_buff_off_ = 0;
@@ -3403,7 +3403,7 @@ class SSLSocketStream final : public Stream {
34033403
time_t write_timeout_sec_;
34043404
time_t write_timeout_usec_;
34053405
time_t max_timeout_msec_;
3406-
const std::chrono::time_point<std::chrono::steady_clock> start_time;
3406+
const std::chrono::time_point<std::chrono::steady_clock> start_time_;
34073407
};
34083408
#endif
34093409

@@ -6060,7 +6060,7 @@ inline SocketStream::SocketStream(
60606060
read_timeout_usec_(read_timeout_usec),
60616061
write_timeout_sec_(write_timeout_sec),
60626062
write_timeout_usec_(write_timeout_usec),
6063-
max_timeout_msec_(max_timeout_msec), start_time(start_time),
6063+
max_timeout_msec_(max_timeout_msec), start_time_(start_time),
60646064
read_buff_(read_buff_size_, 0) {}
60656065

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

61596159
inline time_t SocketStream::duration() const {
61606160
return std::chrono::duration_cast<std::chrono::milliseconds>(
6161-
std::chrono::steady_clock::now() - start_time)
6161+
std::chrono::steady_clock::now() - start_time_)
61626162
.count();
61636163
}
61646164

@@ -9200,7 +9200,7 @@ inline SSLSocketStream::SSLSocketStream(
92009200
read_timeout_usec_(read_timeout_usec),
92019201
write_timeout_sec_(write_timeout_sec),
92029202
write_timeout_usec_(write_timeout_usec),
9203-
max_timeout_msec_(max_timeout_msec), start_time(start_time) {
9203+
max_timeout_msec_(max_timeout_msec), start_time_(start_time) {
92049204
SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY);
92059205
}
92069206

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

93079307
inline time_t SSLSocketStream::duration() const {
93089308
return std::chrono::duration_cast<std::chrono::milliseconds>(
9309-
std::chrono::steady_clock::now() - start_time)
9309+
std::chrono::steady_clock::now() - start_time_)
93109310
.count();
93119311
}
93129312

0 commit comments

Comments
 (0)