Skip to content

Commit

Permalink
update pink and delete some compile warning
Browse files Browse the repository at this point in the history
  • Loading branch information
KernelMaker committed Aug 10, 2016
1 parent 7995d7a commit 9df63f2
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ os:

addons:
apt:
packages: ['zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libprotobuf-dev', 'protobuf-compiler', 'libevent-devel']
packages: ['zlib1g-dev', 'libbz2-dev', 'libsnappy-dev', 'curl', 'libprotobuf-dev', 'protobuf-compiler']

compiler:
- gcc
Expand Down
2 changes: 1 addition & 1 deletion src/pika.cc
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
rlimit limit;
if (getrlimit(RLIMIT_NOFILE,&limit) == -1) {
LOG(WARNING) << "getrlimit error: " << strerror(errno);
} else if (limit.rlim_cur < g_pika_conf->maxclients() + PIKA_MIN_RESERVED_FDS) {
} else if (limit.rlim_cur < static_cast<unsigned int>(g_pika_conf->maxclients() + PIKA_MIN_RESERVED_FDS)) {
rlim_t old_limit = limit.rlim_cur;
rlim_t best_limit = g_pika_conf->maxclients() + PIKA_MIN_RESERVED_FDS;
limit.rlim_cur = best_limit > limit.rlim_max ? limit.rlim_max-1 : best_limit;
Expand Down
2 changes: 1 addition & 1 deletion src/pika_binlog_bgworker.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void BinlogBGWorker::DoBinlogBG(void* arg) {
LOG(WARNING) << "Fail to initial command from binlog: " << opt;
}

uint64_t start_us;
uint64_t start_us = 0;
if (g_pika_conf->slowlog_slower_than() >= 0) {
start_us = slash::NowMicros();
}
Expand Down
2 changes: 1 addition & 1 deletion src/pika_client_conn.cc
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ std::string PikaClientConn::DoCmd(const std::string& opt) {
return "-ERR NOAUTH Authentication required.\r\n";
}

uint64_t start_us;
uint64_t start_us = 0;
if (g_pika_conf->slowlog_slower_than() >= 0) {
start_us = slash::NowMicros();
}
Expand Down
2 changes: 1 addition & 1 deletion third/pink
Submodule pink updated from 14e455 to 1c9d5a

0 comments on commit 9df63f2

Please sign in to comment.