Revert "make `folly::Formatter` extendible"

[folly.git] / folly / Bits.h

diff --git a/folly/Bits.h b/folly/Bits.h
index 020955eb996802a3febdcf83894a5b74fd8a695b..ade126d0803b6920c7fdd8dd1c30fd0009308811 100644 (file)
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -55,7 +55,7 @@
 #ifndef FOLLY_BITS_H_
 #define FOLLY_BITS_H_
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #ifndef __GNUC__
 #error GCC required
@@ -68,13 +68,11 @@
 #define FOLLY_INTRINSIC_CONSTEXPR const
 #endif
 
-#ifndef FOLLY_NO_CONFIG
-#include "folly/folly-config.h"
-#endif
+#include <folly/Portability.h>
 
-#include "folly/detail/BitsDetail.h"
-#include "folly/detail/BitIteratorDetail.h"
-#include "folly/Likely.h"
+#include <folly/detail/BitsDetail.h>
+#include <folly/detail/BitIteratorDetail.h>
+#include <folly/Likely.h>
 
 #if FOLLY_HAVE_BYTESWAP_H
 # include <byteswap.h>
@@ -524,6 +522,7 @@ template <class T, class Enable=void> struct Unaligned;
 /**
  * Representation of an unaligned value of a POD type.
  */
+FOLLY_PACK_PUSH
 template <class T>
 struct Unaligned<
     T,
@@ -531,7 +530,8 @@ struct Unaligned<
   Unaligned() = default;  // uninitialized
   /* implicit */ Unaligned(T v) : value(v) { }
   T value;
-} __attribute__((packed));
+} FOLLY_PACK_ATTR;
+FOLLY_PACK_POP
 
 /**
  * Read an unaligned value of type T and return it.