From: Michael Lee Date: Tue, 1 Mar 2016 15:51:30 +0000 (-0800) Subject: to_string is not supported everywhere X-Git-Tag: deprecate-dynamic-initializer~29 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aa8dce113951ee4d316cfdeba973e06d93089761;p=folly.git to_string is not supported everywhere Summary: Also remove an extra `#include ` from JsonTest.cpp as it is no longer necessary. Reviewed By: yfeldblum Differential Revision: D2991381 fb-gh-sync-id: 386b8281726d034933ebdc26733dd35dc5ace949 shipit-source-id: 386b8281726d034933ebdc26733dd35dc5ace949 --- diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp index 6d2b60c2..785a08c4 100644 --- a/folly/test/IPAddressTest.cpp +++ b/folly/test/IPAddressTest.cpp @@ -444,8 +444,8 @@ TEST_P(IPAddressMaskTest, Masks) { IPAddress ip(param.address); IPAddress masked = ip.mask(param.mask); EXPECT_EQ(param.subnet, masked.str()) - << param.address << "/" << to_string(param.mask) - << " -> " << param.subnet; + << param.address << "/" << folly::to(param.mask) << " -> " + << param.subnet; } // Test inSubnet calculations @@ -567,7 +567,7 @@ TEST(IPAddress, V6Types) { break; default: throw std::range_error("Invalid expected type: " + - to_string(tc.second)); + folly::to(tc.second)); } } } diff --git a/folly/test/JsonTest.cpp b/folly/test/JsonTest.cpp index 18540169..0dd937ca 100644 --- a/folly/test/JsonTest.cpp +++ b/folly/test/JsonTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ #include -#include #include #include