lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Fix some virtual override warnings

Browse Source
This commit is contained in:
Johan Jansen 2019-10-31 21:38:37 +01:00
parent 5706828d2c
commit 58753ba33c
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
httplib.h
View File

@ -311,7 +311,7 @@ struct Response {
class Stream { class Stream {
public: public:
virtual ~Stream() {} virtual ~Stream() = default;
virtual int read(char *ptr, size_t size) = 0; virtual int read(char *ptr, size_t size) = 0;
virtual int write(const char *ptr, size_t size1) = 0; virtual int write(const char *ptr, size_t size1) = 0;
virtual int write(const char *ptr) = 0; virtual int write(const char *ptr) = 0;
@ -326,7 +326,7 @@ class SocketStream : public Stream {
public: public:
SocketStream(socket_t sock, time_t read_timeout_sec, SocketStream(socket_t sock, time_t read_timeout_sec,
time_t read_timeout_usec); time_t read_timeout_usec);
virtual ~SocketStream(); ~SocketStream() override;
int read(char *ptr, size_t size) override; int read(char *ptr, size_t size) override;
int write(const char *ptr, size_t size) override; int write(const char *ptr, size_t size) override;
@ -342,8 +342,8 @@ private:
class BufferStream : public Stream { class BufferStream : public Stream {
public: public:
BufferStream() {} BufferStream() = default;
virtual ~BufferStream() {} ~BufferStream() override = default;
int read(char *ptr, size_t size) override; int read(char *ptr, size_t size) override;
int write(const char *ptr, size_t size) override; int write(const char *ptr, size_t size) override;
@ -359,8 +359,8 @@ private:
class TaskQueue { class TaskQueue {
public: public:
TaskQueue() {} TaskQueue() = default;
virtual ~TaskQueue() {} virtual ~TaskQueue() = default;
virtual void enqueue(std::function<void()> fn) = 0; virtual void enqueue(std::function<void()> fn) = 0;
virtual void shutdown() = 0; virtual void shutdown() = 0;
}; };
@ -368,7 +368,7 @@ public:
#if CPPHTTPLIB_THREAD_POOL_COUNT > 0 #if CPPHTTPLIB_THREAD_POOL_COUNT > 0
class ThreadPool : public TaskQueue { class ThreadPool : public TaskQueue {
public: public:
ThreadPool(size_t n) : shutdown_(false) { explicit ThreadPool(size_t n) : shutdown_(false) {
while (n) { while (n) {
auto t = std::make_shared<std::thread>(worker(*this)); auto t = std::make_shared<std::thread>(worker(*this));
threads_.push_back(t); threads_.push_back(t);
@ -377,15 +377,15 @@ public:
} }
ThreadPool(const ThreadPool &) = delete; ThreadPool(const ThreadPool &) = delete;
virtual ~ThreadPool() {} ~ThreadPool() override = default;
virtual void enqueue(std::function<void()> fn) override { void enqueue(std::function<void()> fn) override {
std::unique_lock<std::mutex> lock(mutex_); std::unique_lock<std::mutex> lock(mutex_);
jobs_.push_back(fn); jobs_.push_back(fn);
cond_.notify_one(); cond_.notify_one();
} }
virtual void shutdown() override { void shutdown() override {
// Stop all worker threads... // Stop all worker threads...
{ {
std::unique_lock<std::mutex> lock(mutex_); std::unique_lock<std::mutex> lock(mutex_);
@ -402,7 +402,7 @@ public:
private: private:
struct worker { struct worker {
worker(ThreadPool &pool) : pool_(pool) {} explicit worker(ThreadPool &pool) : pool_(pool) {}
void operator()() { void operator()() {
for (;;) { for (;;) {