From: Islam AbdelRahman Date: Tue, 29 Nov 2016 18:40:31 +0000 (-0800) Subject: Fix implicit conversion between int64_t to int X-Git-Tag: rocksdb-4.13~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28b01eb86b8da43e2f3644616a07337c4d724e83;p=rocksdb.git Fix implicit conversion between int64_t to int Summary: Make conversion explicit, implicit conversion breaks the build Closes https://github.com/facebook/rocksdb/pull/1589 Differential Revision: D4245158 Pulled By: IslamAbdelRahman fbshipit-source-id: aaec00d --- diff --git a/db/column_family.cc b/db/column_family.cc index 1ddd19fe..3f876ee5 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -571,7 +571,8 @@ int GetL0ThresholdSpeedupCompaction(int level0_file_num_compaction_trigger, if (res >= port::kMaxInt32) { return port::kMaxInt32; } else { - return res; + // res fits in int + return static_cast(res); } } } // namespace