Skip to content

F
folly
Commit 26582c2b authored by Huapeng Zhou's avatar Huapeng Zhou Committed by Facebook GitHub Bot
Browse files
Options

Back out "Workaround a wasm dependency issue" 

Summary: Original commit changeset: 578dd8981922

Reviewed By: jalopezsilva, pdubovitsky

Differential Revision: D24531203

fbshipit-source-id: 573ccd55a4d8f3b6841cc533e25c84b18fe24d4d
parent 5cdac587
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
folly/Range.h
View file @ 26582c2b
...@@ -41,9 +41,7 @@ ...@@ -41,9 +41,7 @@
#include <string_view> // @manual #include <string_view> // @manual
#endif #endif
#ifndef __wasm__
#include <fmt/format.h> #include <fmt/format.h>
#endif
#include <folly/CpuId.h> #include <folly/CpuId.h>
#include <folly/Likely.h> #include <folly/Likely.h>
...@@ -1529,7 +1527,7 @@ constexpr Range<wchar_t const*> operator"" _sp( ...@@ -1529,7 +1527,7 @@ constexpr Range<wchar_t const*> operator"" _sp(
} // namespace folly } // namespace folly
// Avoid ambiguity in older fmt versions due to StringPiece's conversions. // Avoid ambiguity in older fmt versions due to StringPiece's conversions.
#if FMT_VERSION >= 70000 && !defined(__wasm__) #if FMT_VERSION >= 70000
FMT_BEGIN_NAMESPACE FMT_BEGIN_NAMESPACE
template <> template <>
struct formatter<folly::StringPiece> : private formatter<string_view> { struct formatter<folly::StringPiece> : private formatter<string_view> {
......
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