Windows builds were failing due to missing include for std::addressof after D145095. Differential revision: https://reviews.llvm.org/D145919
This patch also updates the moved code to the new style (i.e. formatted, replaced marcos and typedefs) Reviewed By: ldionne, #libc Spies: arichardson, libcxx-commits Differential Revision: https://reviews.llvm.org/D145095