Commit 1e06d081 authored by Sean Cannella's avatar Sean Cannella Committed by Dave Watson

Remove dependency on std::to_string

Summary:
Mobile platform clang doesn't currently support std::to_string
so remove folly's dependency on it.

Test Plan: existing tests

Reviewed By: mpawlowski@fb.com

Subscribers: kmdent, fma, benyluo, shikong, ranjeeth, subodh, pgriess, njormrod

FB internal diff: D1562179

Tasks: 5183325
parent 079e4ffe
......@@ -42,9 +42,12 @@
// V8 JavaScript implementation
#include <double-conversion/double-conversion.h>
#define FOLLY_RANGE_CHECK(condition, message) \
((condition) ? (void)0 : throw std::range_error( \
(__FILE__ "(" + std::to_string((long long int) __LINE__) + "): " \
#define FOLLY_RANGE_CHECK_STRINGIZE(x) #x
#define FOLLY_RANGE_CHECK_STRINGIZE2(x) FOLLY_RANGE_CHECK_STRINGIZE(x)
#define FOLLY_RANGE_CHECK(condition, message) \
((condition) ? (void)0 : throw std::range_error( \
(std::string(__FILE__ "(" FOLLY_RANGE_CHECK_STRINGIZE2(__LINE__) "): ") \
+ (message)).c_str()))
namespace folly {
......@@ -1407,6 +1410,8 @@ to(const Src & value) {
// to avoid defining this global macro name in other files that include Conv.h.
#ifndef FOLLY_CONV_INTERNAL
#undef FOLLY_RANGE_CHECK
#undef FOLLY_RANGE_CHECK_STRINGIZE2
#undef FOLLY_RANGE_CHECK_STRINGIZE
#endif
#endif /* FOLLY_BASE_CONV_H_ */
......@@ -24,6 +24,7 @@
#include <boost/operators.hpp>
#include <folly/Conv.h>
#include <folly/Format.h>
#include <folly/Range.h>
#include <folly/IPAddressException.h>
......@@ -98,7 +99,7 @@ class IPAddress : boost::totally_ordered<IPAddress> {
* @return string representing the netblock
*/
static std::string networkToString(const CIDRNetwork& network) {
return network.first.str() + "/" + std::to_string(network.second);
return network.first.str() + "/" + folly::to<std::string>(network.second);
}
/**
......
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