Skip to content

Commit

Permalink
Update includes of folly shim headers
Browse files Browse the repository at this point in the history
Some headers in folly have moved. Relevant to react-native, folly/Bits.h has moved to folly/lang/Bits.h. A temporary shim has been left at folly/Bits.h, but it is slated for removal.
  • Loading branch information
yfeldblum committed Dec 16, 2017
1 parent 6ae0b34 commit aeb52ac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions ReactCommon/cxxreact/oss-compat-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
#define USE_FOLLY_FOR_ENDIAN_SWAP 1
#define USE_FOLLY_FOR_TO_STRING 1
#elif defined(__has_include)
#define USE_FOLLY_FOR_ENDIAN_SWAP __has_include(<folly/Bits.h>)
#define USE_FOLLY_FOR_ENDIAN_SWAP __has_include(<folly/lang/Bits.h>)
#define USE_FOLLY_FOR_TO_STRING __has_include(<folly/Conv.h>)
#else
#define USE_FOLLY_FOR_ENDIAN_SWAP 0
#define USE_FOLLY_FOR_TO_STRING 0
#endif

#if USE_FOLLY_FOR_ENDIAN_SWAP
#include <folly/Bits.h>
#include <folly/lang/Bits.h>
#elif defined(__APPLE__)
#include <cstdint>
#include <CoreFoundation/CFByteOrder.h>
Expand Down
5 changes: 2 additions & 3 deletions third-party-podspecs/Folly.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'Folly'
spec.version = '2016.09.26.00'
spec.version = '2017.12.11.00'
spec.license = { :type => 'Apache License, Version 2.0' }
spec.homepage = 'https://github.com/facebook/folly'
spec.summary = 'An open-source C++ library developed and used at Facebook.'
Expand All @@ -12,8 +12,7 @@ Pod::Spec.new do |spec|
spec.dependency 'DoubleConversion'
spec.dependency 'GLog'
spec.compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
spec.source_files = 'folly/Bits.cpp',
'folly/Conv.cpp',
spec.source_files = 'folly/Conv.cpp',
'folly/Demangle.cpp',
'folly/StringBase.cpp',
'folly/Unicode.cpp',
Expand Down

0 comments on commit aeb52ac

Please sign in to comment.