From 75cab39801206f6d898943b85f3896f01ecf0068 Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glenfe@live.com>
Date: Mon, 24 Feb 2014 08:35:59 -0800
Subject: [PATCH] Drop the BOOST_NO_CXX11_STD_ALIGN-undefined path

Until the merge of Boost.Config develop to master
---
 include/boost/smart_ptr/detail/sp_align.hpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/boost/smart_ptr/detail/sp_align.hpp b/include/boost/smart_ptr/detail/sp_align.hpp
index b78bdc0..5a616ee 100644
--- a/include/boost/smart_ptr/detail/sp_align.hpp
+++ b/include/boost/smart_ptr/detail/sp_align.hpp
@@ -9,20 +9,10 @@
 #ifndef BOOST_SMART_PTR_DETAIL_SP_ALIGN_HPP
 #define BOOST_SMART_PTR_DETAIL_SP_ALIGN_HPP
 
-#include <boost/config.hpp>
-#if !defined(BOOST_NO_CXX11_STD_ALIGN)
-#include <memory>
-#endif
+#include <cstddef>
 
 namespace boost {
     namespace detail {
-#if !defined(BOOST_NO_CXX11_STD_ALIGN)
-        inline void* sp_align(std::size_t alignment, void* ptr) {
-            std::size_t n1 = alignment - 1;
-            std::align(alignment, 0, ptr, n1);
-            return ptr;
-        }
-#else
         inline void* sp_align(std::size_t alignment, void* ptr) {
             std::size_t n1 = (std::size_t)ptr % alignment;
             if (n1 != 0) {
@@ -30,7 +20,6 @@ namespace boost {
             }
             return ptr;
         }
-#endif
     }
 }