Skip to content

optimizestatic const，more cplusplus and complire detect error #452

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

Open
jiapengwen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

optimizestatic const，more cplusplus and complire detect error #452

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion muduo/base/Date.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Date : public muduo::copyable
int day; // [1..31]
};

static const int kDaysPerWeek = 7;
static constexpr int kDaysPerWeek = 7;
static const int kJulianDayOf1970_01_01;

///
Expand Down
4 changes: 2 additions & 2 deletions muduo/net/Buffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ namespace net
class Buffer : public muduo::copyable
{
public:
static const size_t kCheapPrepend = 8;
static const size_t kInitialSize = 1024;
static constexpr size_t kCheapPrepend = 8;
static constexpr size_t kInitialSize = 1024;

explicit Buffer(size_t initialSize = kInitialSize)
: buffer_(kCheapPrepend + initialSize),
Expand Down
4 changes: 2 additions & 2 deletions muduo/net/Connector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ class Connector : noncopyable,

private:
enum States { kDisconnected, kConnecting, kConnected };
static const int kMaxRetryDelayMs = 30*1000;
static const int kInitRetryDelayMs = 500;
static constexpr int kMaxRetryDelayMs = 30*1000;
static constexpr int kInitRetryDelayMs = 500;

void setState(States s) { state_ = s; }
void startInLoop();
Expand Down
2 changes: 1 addition & 1 deletion muduo/net/poller/EPollPoller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class EPollPoller : public Poller
void removeChannel(Channel* channel) override;

private:
static const int kInitEventListSize = 16;
static constexpr int kInitEventListSize = 16;

static const char* operationToString(int op);

Expand Down