1 files changed, 26 insertions, 0 deletions
diff --git a/src/mongo/stdx/memory.h b/src/mongo/stdx/memory.h
index 83793f86c5a..8d04d728263 100644
--- a/src/mongo/stdx/memory.h
+++ b/src/mongo/stdx/memory.h
@@ -55,3 +55,29 @@ using boost::make_unique;  // NOLINT
 }  // namespace mongo
 
 #endif
+
+#if defined(MONGO_CONFIG_HAVE_STD_ALIGN)
+
+#include <memory>
+
+namespace mongo {
+namespace stdx {
+
+using ::std::align;  // NOLINT
+
+}  // namespace stdx
+}  // namespace mongo
+
+#else
+
+#include <boost/align/align.hpp>
+
+namespace mongo {
+namespace stdx {
+
+using boost::alignment::align;  // NOLINT
+
+}  // namespace stdx
+}  // namespace mongo
+
+#endif