From: Tudor Bosman <tudorb@fb.com>
Date: Fri, 6 Jul 2012 02:25:17 +0000 (-0700)
Subject: (minor changes, part of unrelated diff)
X-Git-Tag: v0.22.0~1248
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6dca2b329e9b25799b0856265f02714754087ec4;p=folly.git

(minor changes, part of unrelated diff)

Test Plan: no

Reviewed By: philipp@fb.com

FB internal diff: D512868
---

diff --git a/folly/Bits.h b/folly/Bits.h
index 6ee18055..5a131f23 100644
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -528,8 +528,6 @@ BitIterator<BaseIter> findFirstSet(BitIterator<BaseIter> begin,
 }
 
 
-namespace detail {
-
 template <class T, class Enable=void> struct Unaligned;
 
 template <class T>
@@ -539,15 +537,13 @@ struct Unaligned<
   T value;
 } __attribute__((packed));
 
-}  // namespace detail
-
 /**
  * Read an unaligned value of type T and return it.
  */
 template <class T>
 inline T loadUnaligned(const void* p) {
-  static_assert(alignof(detail::Unaligned<T>) == 1, "Invalid alignment");
-  return static_cast<const detail::Unaligned<T>*>(p)->value;
+  static_assert(alignof(Unaligned<T>) == 1, "Invalid alignment");
+  return static_cast<const Unaligned<T>*>(p)->value;
 }
 
 /**
@@ -555,8 +551,8 @@ inline T loadUnaligned(const void* p) {
  */
 template <class T>
 inline void storeUnaligned(void* p, T value) {
-  static_assert(alignof(detail::Unaligned<T>) == 1, "Invalid alignment");
-  static_cast<detail::Unaligned<T>*>(p)->value = value;
+  static_assert(alignof(Unaligned<T>) == 1, "Invalid alignment");
+  static_cast<Unaligned<T>*>(p)->value = value;
 }
 
 }  // namespace folly