From: Michael Lee Date: Wed, 6 Jul 2016 20:41:57 +0000 (-0700) Subject: Clean up int128_t macro gating X-Git-Tag: 2016.07.26~73 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=60699fefadef15f769f24bfe3b174a9c3f252cba;p=folly.git Clean up int128_t macro gating Summary: There is inconsistent use of `#ifdef` and `#if`. Cleaning this up Reviewed By: yfeldblum Differential Revision: D3523561 fbshipit-source-id: 23f62d632efeb1b9b137b3e3582c37aae591d901 --- diff --git a/folly/Conv.cpp b/folly/Conv.cpp index 199819e3..e11d8693 100644 --- a/folly/Conv.cpp +++ b/folly/Conv.cpp @@ -69,7 +69,7 @@ static_assert(sizeof(unsigned long long) >= 8, "Wrong value for MaxString::value" ", please update."); -#ifdef FOLLY_HAVE_INT128_T +#if FOLLY_HAVE_INT128_T template <> const char *const MaxString<__uint128_t>::value = "340282366920938463463374607431768211455"; #endif diff --git a/folly/Conv.h b/folly/Conv.h index d6553373..0af04cf6 100644 --- a/folly/Conv.h +++ b/folly/Conv.h @@ -702,7 +702,7 @@ struct HasLengthEstimator : std::false_type {}; template constexpr typename std::enable_if< !std::is_fundamental::value -#ifdef FOLLY_HAVE_INT128_T +#if FOLLY_HAVE_INT128_T // On OSX 10.10, is_fundamental<__int128> is false :-O && !std::is_same<__int128, Src>::value && !std::is_same::value