Commit 48832457 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot 8

Use float literals when initializing float values

Summary: MSVC was correctly warning that we were initializing `float` variables with `double` literals. This just adds the explicit suffix so they are `float` literals instead.

Reviewed By: yfeldblum

Differential Revision: D3506797

fbshipit-source-id: 7eb4588958eddb984ba830e2599ac505d495783e
parent 389ce43b
...@@ -181,7 +181,7 @@ TEST(Ahm, grow) { ...@@ -181,7 +181,7 @@ TEST(Ahm, grow) {
VLOG(1) << "Overhead: " << sizeof(AHArrayT) << " (array) " << VLOG(1) << "Overhead: " << sizeof(AHArrayT) << " (array) " <<
sizeof(AHMapT) + sizeof(AHArrayT) << " (map/set) Bytes."; sizeof(AHMapT) + sizeof(AHArrayT) << " (map/set) Bytes.";
uint64_t numEntries = 10000; uint64_t numEntries = 10000;
float sizeFactor = 0.46; float sizeFactor = 0.46f;
std::unique_ptr<AHMapT> m(new AHMapT(int(numEntries * sizeFactor), config)); std::unique_ptr<AHMapT> m(new AHMapT(int(numEntries * sizeFactor), config));
...@@ -241,7 +241,7 @@ TEST(Ahm, grow) { ...@@ -241,7 +241,7 @@ TEST(Ahm, grow) {
TEST(Ahm, iterator) { TEST(Ahm, iterator) {
int numEntries = 10000; int numEntries = 10000;
float sizeFactor = .46; float sizeFactor = .46f;
std::unique_ptr<AHMapT> m(new AHMapT(int(numEntries * sizeFactor), config)); std::unique_ptr<AHMapT> m(new AHMapT(int(numEntries * sizeFactor), config));
// load map - make sure we succeed and the index is accurate // load map - make sure we succeed and the index is accurate
...@@ -347,7 +347,7 @@ TEST(Ahm, map_exception_safety) { ...@@ -347,7 +347,7 @@ TEST(Ahm, map_exception_safety) {
typedef AtomicHashMap<KeyT,Integer> MyMapT; typedef AtomicHashMap<KeyT,Integer> MyMapT;
int numEntries = 10000; int numEntries = 10000;
float sizeFactor = 0.46; float sizeFactor = 0.46f;
std::unique_ptr<MyMapT> m(new MyMapT(int(numEntries * sizeFactor))); std::unique_ptr<MyMapT> m(new MyMapT(int(numEntries * sizeFactor)));
bool success = true; bool success = true;
...@@ -470,7 +470,7 @@ TEST(Ahm, collision_test) { ...@@ -470,7 +470,7 @@ TEST(Ahm, collision_test) {
// Doing the same number on each thread so we collide. // Doing the same number on each thread so we collide.
numOpsPerThread = numInserts; numOpsPerThread = numInserts;
float sizeFactor = 0.46; float sizeFactor = 0.46f;
int entrySize = sizeof(KeyT) + sizeof(ValueT); int entrySize = sizeof(KeyT) + sizeof(ValueT);
VLOG(1) << "Testing " << numInserts << " unique " << entrySize << VLOG(1) << "Testing " << numInserts << " unique " << entrySize <<
" Byte entries replicated in " << FLAGS_numThreads << " Byte entries replicated in " << FLAGS_numThreads <<
......
...@@ -509,7 +509,7 @@ char someString[] = "this is some nice string"; ...@@ -509,7 +509,7 @@ char someString[] = "this is some nice string";
char otherString[] = "this is a long string, so it's not so nice"; char otherString[] = "this is a long string, so it's not so nice";
char reallyShort[] = "meh"; char reallyShort[] = "meh";
std::string stdString = "std::strings are very nice"; std::string stdString = "std::strings are very nice";
float fValue = 1.2355; float fValue = 1.2355f;
double dValue = 345345345.435; double dValue = 345345345.435;
} }
} }
......
...@@ -81,7 +81,7 @@ TEST(Conv, Type2Type) { ...@@ -81,7 +81,7 @@ TEST(Conv, Type2Type) {
int intV = 42; int intV = 42;
EXPECT_EQ(to<int>(intV), 42); EXPECT_EQ(to<int>(intV), 42);
float floatV = 4.2; float floatV = 4.2f;
EXPECT_EQ(to<float>(floatV), 4.2f); EXPECT_EQ(to<float>(floatV), 4.2f);
double doubleV = 0.42; double doubleV = 0.42;
...@@ -117,7 +117,7 @@ TEST(Conv, Integral2Integral) { ...@@ -117,7 +117,7 @@ TEST(Conv, Integral2Integral) {
} }
TEST(Conv, Floating2Floating) { TEST(Conv, Floating2Floating) {
float f1 = 1e3; float f1 = 1e3f;
double d1 = to<double>(f1); double d1 = to<double>(f1);
EXPECT_EQ(f1, d1); EXPECT_EQ(f1, d1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment