You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

23 lines
548 B

  1. --- a/folly/CachelinePadded.h
  2. +++ b/folly/CachelinePadded.h
  3. @@ -35,10 +35,6 @@ namespace folly {
  4. */
  5. template <typename T>
  6. class CachelinePadded {
  7. - static_assert(
  8. - alignof(T) <= max_align_v,
  9. - "CachelinePadded does not support over-aligned types.");
  10. -
  11. public:
  12. template <typename... Args>
  13. explicit CachelinePadded(Args&&... args)
  14. --- a/folly/external/farmhash/farmhash.cpp
  15. +++ b/folly/external/farmhash/farmhash.cpp
  16. @@ -181,6 +181,7 @@
  17. #undef bswap_32
  18. #undef bswap_64
  19. +#undef _BYTESWAP_H
  20. #include <byteswap.h>
  21. #endif