From 324347b9ec5a96339d667e83857087e331d3465b Mon Sep 17 00:00:00 2001
From: Glen Fernandes <glenfe@live.com>
Date: Mon, 6 Mar 2017 01:18:16 -0500
Subject: [PATCH] Update unit tests for shared array functions

---
 test/allocate_shared_array_construct_test.cpp | 171 ++++++----
 test/allocate_shared_array_esft_test.cpp      |  71 +++-
 test/allocate_shared_array_noinit_test.cpp    | 264 ++++++++++-----
 test/allocate_shared_array_test.cpp           | 307 +++++++++++-------
 test/allocate_shared_array_throws_test.cpp    |  75 ++++-
 test/allocate_shared_array_value_test.cpp     |  90 +++--
 test/allocate_shared_arrays_test.cpp          | 101 ++++--
 test/make_shared_array_esft_test.cpp          |  32 +-
 test/make_shared_array_noinit_test.cpp        | 220 ++++++++-----
 test/make_shared_array_test.cpp               | 270 ++++++++-------
 test/make_shared_array_throws_test.cpp        |  22 +-
 test/make_shared_array_value_test.cpp         |  53 +--
 test/make_shared_arrays_test.cpp              |  62 ++--
 13 files changed, 1117 insertions(+), 621 deletions(-)

diff --git a/test/allocate_shared_array_construct_test.cpp b/test/allocate_shared_array_construct_test.cpp
index 0228275..669e813 100644
--- a/test/allocate_shared_array_construct_test.cpp
+++ b/test/allocate_shared_array_construct_test.cpp
@@ -1,127 +1,162 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-struct tag { };
+#if !defined(BOOST_NO_CXX11_ALLOCATOR)
+struct allow { };
 
-template<typename T>
-class creator {
-public:
+template<class T>
+struct creator {
     typedef T value_type;
-    creator() {
-    }
-    template<typename U>
-    creator(const creator<U>&) {
-    }
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
     T* allocate(std::size_t size) {
-        void* p = ::operator new(size * sizeof(T));
-        return static_cast<T*>(p);
+        return static_cast<T*>(::operator new(sizeof(T) * size));
     }
-    void deallocate(T* memory, std::size_t) {
-        void* p = memory;
-        ::operator delete(p);
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
     }
-    template<typename U>
-    void construct(U* memory) {
-        void* p = memory;
-        ::new(p) U(tag());
+
+    template<class U>
+    void construct(U* ptr) {
+        ::new(static_cast<void*>(ptr)) U(allow());
     }
-    template<typename U>
-    void destroy(U* memory) {
-        memory->~U();
+
+    template<class U>
+    void destroy(U* ptr) {
+        ptr->~U();
     }
+
 };
 
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
 class type {
 public:
-    static unsigned int instances;
-    explicit type(tag) {
-        instances++;
-    }
-    type(const type&) {
-        instances++;
+    static unsigned instances;
+
+    explicit type(allow) {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
+private:
+    type(const type&);
+    type& operator=(const type&);
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
-#if !defined(BOOST_NO_CXX11_ALLOCATOR)
     {
-        boost::shared_ptr<type[]> a1 = boost::allocate_shared<type[]>(creator<void>(), 3);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1.get() != 0);
+        boost::shared_ptr<type[]> result =
+            boost::allocate_shared<type[]>(creator<type>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[3]> a1 = boost::allocate_shared<type[3]>(creator<void>());
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1.get() != 0);
+        boost::shared_ptr<type[3]> result =
+            boost::allocate_shared<type[3]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[][2]> a1 = boost::allocate_shared<type[][2]>(creator<void>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[][2]> result =
+            boost::allocate_shared<type[][2]>(creator<type>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[2][2]> a1 = boost::allocate_shared<type[2][2]>(creator<void>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[2][2]> result =
+            boost::allocate_shared<type[2][2]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[]> a1 = boost::allocate_shared<const type[]>(creator<void>(), 3);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[]> result =
+            boost::allocate_shared<const type[]>(creator<type>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[3]> a1 = boost::allocate_shared<const type[3]>(creator<void>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[3]> result =
+            boost::allocate_shared<const type[3]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[][2]> a1 = boost::allocate_shared<const type[][2]>(creator<void>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[][2]> result =
+            boost::allocate_shared<const type[][2]>(creator<type>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[2][2]> a1 = boost::allocate_shared<const type[2][2]>(creator<void>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[2][2]> result =
+            boost::allocate_shared<const type[2][2]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
-#endif
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/allocate_shared_array_esft_test.cpp b/test/allocate_shared_array_esft_test.cpp
index 30edfff..0399c1a 100644
--- a/test/allocate_shared_array_esft_test.cpp
+++ b/test/allocate_shared_array_esft_test.cpp
@@ -1,39 +1,79 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/enable_shared_from_this.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
-class type 
+template<class T>
+struct creator {
+    typedef T value_type;
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
+    T* allocate(std::size_t size) {
+        return static_cast<T*>(::operator new(sizeof(T) * size));
+    }
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
+    }
+};
+
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
+class type
     : public boost::enable_shared_from_this<type> {
 public:
-    static unsigned int instances;
-    explicit type() {
-        instances++;
+    static unsigned instances;
+
+    type() {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
 private:
     type(const type&);
     type& operator=(const type&);
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     BOOST_TEST(type::instances == 0);
     {
-        boost::shared_ptr<type[]> a1 = boost::allocate_shared<type[]>(std::allocator<type>(), 3);
+        boost::shared_ptr<type[]> result =
+            boost::allocate_shared<type[]>(creator<type>(), 3);
         try {
-            a1[0].shared_from_this();
+            result[0].shared_from_this();
             BOOST_ERROR("shared_from_this did not throw");
         } catch (...) {
             BOOST_TEST(type::instances == 3);
@@ -41,9 +81,10 @@ int main()
     }
     BOOST_TEST(type::instances == 0);
     {
-        boost::shared_ptr<type[]> a1 = boost::allocate_shared_noinit<type[]>(std::allocator<type>(), 3);
+        boost::shared_ptr<type[]> result =
+            boost::allocate_shared_noinit<type[]>(creator<type>(), 3);
         try {
-            a1[0].shared_from_this();
+            result[0].shared_from_this();
             BOOST_ERROR("shared_from_this did not throw");
         } catch (...) {
             BOOST_TEST(type::instances == 3);
diff --git a/test/allocate_shared_array_noinit_test.cpp b/test/allocate_shared_array_noinit_test.cpp
index 83b48ec..f30ee17 100644
--- a/test/allocate_shared_array_noinit_test.cpp
+++ b/test/allocate_shared_array_noinit_test.cpp
@@ -1,154 +1,250 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/align/is_aligned.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 
+template<class T>
+struct creator {
+    typedef T value_type;
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
+    T* allocate(std::size_t size) {
+        return static_cast<T*>(::operator new(sizeof(T) * size));
+    }
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
+    }
+};
+
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
 class type {
 public:
-    static unsigned int instances;
-    explicit type() {
-        instances++;
+    static unsigned instances;
+
+    type()
+        : value_(0.0) {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
+    void set(long double value) {
+        value_ = value;
+    }
+
+    long double get() const {
+        return value_;
+    }
+
 private:
     type(const type&);
     type& operator=(const type&);
+
+    long double value_;
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     {
-        boost::shared_ptr<int[]> a1 = boost::allocate_shared_noinit<int[]>(std::allocator<int>(), 3);
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<int[]> result =
+            boost::allocate_shared_noinit<int[]>(creator<int>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<int[3]> a1 = boost::allocate_shared_noinit<int[3]>(std::allocator<int>());
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<int[3]> result =
+            boost::allocate_shared_noinit<int[3]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<int[][2]> a1 = boost::allocate_shared_noinit<int[][2]>(std::allocator<int>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<int[][2]> result =
+            boost::allocate_shared_noinit<int[][2]>(creator<int>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<int[2][2]> a1 = boost::allocate_shared_noinit<int[2][2]>(std::allocator<int>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<int[2][2]> result =
+            boost::allocate_shared_noinit<int[2][2]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[]> a1 = boost::allocate_shared_noinit<const int[]>(std::allocator<int>(), 3);
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<const int[]> result =
+            boost::allocate_shared_noinit<const
+                int[]>(creator<int>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[3]> a1 = boost::allocate_shared_noinit<const int[3]>(std::allocator<int>());
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<const int[3]> result =
+            boost::allocate_shared_noinit<const int[3]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[][2]> a1 = boost::allocate_shared_noinit<const int[][2]>(std::allocator<int>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const int[][2]> result =
+            boost::allocate_shared_noinit<const
+                int[][2]>(creator<int>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[2][2]> a1 = boost::allocate_shared_noinit<const int[2][2]>(std::allocator<int>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const int[2][2]> result =
+            boost::allocate_shared_noinit<const
+                int[2][2]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<type[]> a1 = boost::allocate_shared_noinit<type[]>(std::allocator<type>(), 3);
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[]> result =
+            boost::allocate_shared_noinit<type[]>(creator<type>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[3]> a1 = boost::allocate_shared_noinit<type[3]>(std::allocator<type>());
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[3]> result =
+            boost::allocate_shared_noinit<type[3]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[3]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[3]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[][2]> a1 = boost::allocate_shared_noinit<type[][2]>(std::allocator<type>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[][2]> result =
+            boost::allocate_shared_noinit<type[][2]>(creator<type>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<type[][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[2][2]> a1 = boost::allocate_shared_noinit<type[2][2]>(std::allocator<type>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[2][2]> result =
+            boost::allocate_shared_noinit<type[2][2]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<type[2][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[]> a1 = boost::allocate_shared_noinit<const type[]>(std::allocator<type>(), 3);
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[]> result =
+            boost::allocate_shared_noinit<const
+                type[]>(creator<type>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        boost::weak_ptr<const type[]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[3]> a1 = boost::allocate_shared_noinit<const type[3]>(std::allocator<type>());
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[3]> result =
+            boost::allocate_shared_noinit<const
+                type[3]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        boost::weak_ptr<const type[3]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[][2]> a1 = boost::allocate_shared_noinit<const type[][2]>(std::allocator<type>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[][2]> result =
+            boost::allocate_shared_noinit<const
+                type[][2]>(creator<type>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<const type[][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[2][2]> a1 = boost::allocate_shared_noinit<const type[2][2]>(std::allocator<type>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[2][2]> result =
+            boost::allocate_shared_noinit<const
+                type[2][2]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<const type[2][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     return boost::report_errors();
diff --git a/test/allocate_shared_array_test.cpp b/test/allocate_shared_array_test.cpp
index c5a5714..0369631 100644
--- a/test/allocate_shared_array_test.cpp
+++ b/test/allocate_shared_array_test.cpp
@@ -1,182 +1,265 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/align/is_aligned.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
 #include <boost/type_traits/alignment_of.hpp>
 
+template<class T>
+struct creator {
+    typedef T value_type;
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
+    T* allocate(std::size_t size) {
+        return static_cast<T*>(::operator new(sizeof(T) * size));
+    }
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
+    }
+};
+
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
 class type {
 public:
-    static unsigned int instances;
-    explicit type() {
-        instances++;
+    static unsigned instances;
+
+    type()
+        : value_(0.0) {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
+    void set(long double value) {
+        value_ = value;
+    }
+
+    long double get() const {
+        return value_;
+    }
+
 private:
     type(const type&);
     type& operator=(const type&);
+
+    long double value_;
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     {
-        boost::shared_ptr<int[]> a1 = boost::allocate_shared<int[]>(std::allocator<int>(), 3);
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<int[]> result =
+            boost::allocate_shared<int[]>(creator<int>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<int[3]> a1 = boost::allocate_shared<int[3]>(std::allocator<int>());
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<int[3]> result =
+            boost::allocate_shared<int[3]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<int[][2]> a1 = boost::allocate_shared<int[][2]>(std::allocator<int>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<int[][2]> result =
+            boost::allocate_shared<int[][2]>(creator<int>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<int[2][2]> a1 = boost::allocate_shared<int[2][2]>(std::allocator<int>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<int[2][2]> result =
+            boost::allocate_shared<int[2][2]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<const int[]> a1 = boost::allocate_shared<const int[]>(std::allocator<int>(), 3);
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<const int[]> result =
+            boost::allocate_shared<const int[]>(creator<int>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<const int[3]> a1 = boost::allocate_shared<const int[3]>(std::allocator<int>());
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<const int[3]> result =
+            boost::allocate_shared<const int[3]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<const int[][2]> a1 = boost::allocate_shared<const int[][2]>(std::allocator<int>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<const int[][2]> result =
+            boost::allocate_shared<const int[][2]>(creator<int>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<const int[2][2]> a1 = boost::allocate_shared<const int[2][2]>(std::allocator<int>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<const int[2][2]> result =
+            boost::allocate_shared<const int[2][2]>(creator<int>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<type[]> a1 = boost::allocate_shared<type[]>(std::allocator<type>(), 3);
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[]> result =
+            boost::allocate_shared<type[]>(creator<type>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[]> w1 = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[3]> a1 = boost::allocate_shared<type[3]>(std::allocator<type>());
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[3]> result =
+            boost::allocate_shared<type[3]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[3]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[3]> w1 = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[][2]> a1 = boost::allocate_shared<type[][2]>(std::allocator<type>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[][2]> result =
+            boost::allocate_shared<type[][2]>(creator<type>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[2][2]> a1 = boost::allocate_shared<type[2][2]>(std::allocator<type>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[2][2]> result =
+            boost::allocate_shared<type[2][2]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[]> a1 = boost::allocate_shared<const type[]>(std::allocator<type>(), 3);
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[]> result =
+            boost::allocate_shared<const type[]>(creator<type>(), 3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[3]> a1 = boost::allocate_shared<const type[3]>(std::allocator<type>());
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[3]> result =
+            boost::allocate_shared<const type[3]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[][2]> a1 = boost::allocate_shared<const type[][2]>(std::allocator<type>(), 2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[][2]> result =
+            boost::allocate_shared<const type[][2]>(creator<type>(), 2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[2][2]> a1 = boost::allocate_shared<const type[2][2]>(std::allocator<type>());
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[2][2]> result =
+            boost::allocate_shared<const type[2][2]>(creator<type>());
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     return boost::report_errors();
diff --git a/test/allocate_shared_array_throws_test.cpp b/test/allocate_shared_array_throws_test.cpp
index e14d984..9857d18 100644
--- a/test/allocate_shared_array_throws_test.cpp
+++ b/test/allocate_shared_array_throws_test.cpp
@@ -1,79 +1,118 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+template<class T>
+struct creator {
+    typedef T value_type;
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
+    T* allocate(std::size_t size) {
+        return static_cast<T*>(::operator new(sizeof(T) * size));
+    }
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
+    }
+};
+
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
 class type {
 public:
-    static unsigned int instances;
-    explicit type() {
+    static unsigned instances;
+
+    type() {
         if (instances == 5) {
             throw true;
         }
-        instances++;
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
 private:
     type(const type&);
     type& operator=(const type&);
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     try {
-        boost::allocate_shared<type[]>(std::allocator<type>(), 6);
+        boost::allocate_shared<type[]>(creator<type>(), 6);
         BOOST_ERROR("allocate_shared did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared<type[][2]>(std::allocator<type>(), 3);
+        boost::allocate_shared<type[][2]>(creator<type>(), 3);
         BOOST_ERROR("allocate_shared did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared<type[6]>(std::allocator<type>());
+        boost::allocate_shared<type[6]>(creator<type>());
         BOOST_ERROR("allocate_shared did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared<type[3][2]>(std::allocator<type>());
+        boost::allocate_shared<type[3][2]>(creator<type>());
         BOOST_ERROR("allocate_shared did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared_noinit<type[]>(std::allocator<type>(), 6);
+        boost::allocate_shared_noinit<type[]>(creator<type>(), 6);
         BOOST_ERROR("allocate_shared_noinit did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared_noinit<type[][2]>(std::allocator<type>(), 3);
+        boost::allocate_shared_noinit<type[][2]>(creator<type>(), 3);
         BOOST_ERROR("allocate_shared_noinit did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared_noinit<type[6]>(std::allocator<type>());
+        boost::allocate_shared_noinit<type[6]>(creator<type>());
         BOOST_ERROR("allocate_shared_noinit did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
     }
     try {
-        boost::allocate_shared_noinit<type[3][2]>(std::allocator<type>());
+        boost::allocate_shared_noinit<type[3][2]>(creator<type>());
         BOOST_ERROR("allocate_shared_noinit did not throw");
     } catch (...) {
         BOOST_TEST(type::instances == 0);
diff --git a/test/allocate_shared_array_value_test.cpp b/test/allocate_shared_array_value_test.cpp
index c6f08f9..485c477 100644
--- a/test/allocate_shared_array_value_test.cpp
+++ b/test/allocate_shared_array_value_test.cpp
@@ -1,43 +1,83 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+template<class T>
+struct creator {
+    typedef T value_type;
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
+    T* allocate(std::size_t size) {
+        return static_cast<T*>(::operator new(sizeof(T) * size));
+    }
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
+    }
+};
+
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
 int main()
 {
     {
-        boost::shared_ptr<int[]> a1 = boost::allocate_shared<int[]>(std::allocator<int>(), 4, 1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<int[]> result =
+            boost::allocate_shared<int[]>(creator<int>(), 4, 1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     {
-        boost::shared_ptr<int[4]> a1 = boost::allocate_shared<int[4]>(std::allocator<int>(), 1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<int[4]> result =
+            boost::allocate_shared<int[4]>(creator<int>(), 1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     {
-        boost::shared_ptr<const int[]> a1 = boost::allocate_shared<const int[]>(std::allocator<int>(), 4, 1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<const int[]> result =
+            boost::allocate_shared<const int[]>(creator<int>(), 4, 1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     {
-        boost::shared_ptr<const int[4]> a1 = boost::allocate_shared<const int[4]>(std::allocator<int>(), 1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<const int[4]> result =
+            boost::allocate_shared<const int[4]>(creator<int>(), 1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     return boost::report_errors();
 }
diff --git a/test/allocate_shared_arrays_test.cpp b/test/allocate_shared_arrays_test.cpp
index 7c45e72..a088a22 100644
--- a/test/allocate_shared_arrays_test.cpp
+++ b/test/allocate_shared_arrays_test.cpp
@@ -1,45 +1,92 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
+template<class T>
+struct creator {
+    typedef T value_type;
+
+    template<class U>
+    struct rebind {
+        typedef creator<U> other;
+    };
+
+    creator() { }
+
+    template<class U>
+    creator(const creator<U>&) { }
+
+    T* allocate(std::size_t size) {
+        return static_cast<T*>(::operator new(sizeof(T) * size));
+    }
+
+    void deallocate(T* ptr, std::size_t) {
+        ::operator delete(ptr);
+    }
+};
+
+template<class T, class U>
+inline bool
+operator==(const creator<T>&, const creator<U>&)
+{
+    return true;
+}
+
+template<class T, class U>
+inline bool
+operator!=(const creator<T>&, const creator<U>&)
+{
+    return false;
+}
+
 int main()
 {
-#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
     {
-        boost::shared_ptr<int[][2]> a1 = boost::allocate_shared<int[][2]>(std::allocator<int>(), 2, {0, 1});
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<int[][2]> result =
+            boost::allocate_shared<int[][2]>(creator<int>(), 2, {0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
     {
-        boost::shared_ptr<int[2][2]> a1 = boost::allocate_shared<int[2][2]>(std::allocator<int>(), { 0, 1 });
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<int[2][2]> result =
+            boost::allocate_shared<int[2][2]>(creator<int>(), {0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
     {
-        boost::shared_ptr<const int[][2]> a1 = boost::allocate_shared<const int[][2]>(std::allocator<int>(), 2, { 0, 1 });
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<const int[][2]> result =
+            boost::allocate_shared<const
+                int[][2]>(creator<int>(), 2, {0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
     {
-        boost::shared_ptr<const int[2][2]> a1 = boost::allocate_shared<const int[2][2]>(std::allocator<int>(), { 0, 1 });
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<const int[2][2]> result =
+            boost::allocate_shared<const
+                int[2][2]>(creator<int>(), {0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
-#endif
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif
diff --git a/test/make_shared_array_esft_test.cpp b/test/make_shared_array_esft_test.cpp
index 8429919..f52e3cf 100644
--- a/test/make_shared_array_esft_test.cpp
+++ b/test/make_shared_array_esft_test.cpp
@@ -1,10 +1,9 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/enable_shared_from_this.hpp>
@@ -13,27 +12,31 @@ http://boost.org/LICENSE_1_0.txt
 class type
     : public boost::enable_shared_from_this<type> {
 public:
-    static unsigned int instances;
-    explicit type() {
-        instances++;
+    static unsigned instances;
+
+    type() {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
 private:
     type(const type&);
     type& operator=(const type&);
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     BOOST_TEST(type::instances == 0);
     {
-        boost::shared_ptr<type[]> a1 = boost::make_shared<type[]>(3);
+        boost::shared_ptr<type[]> result =
+            boost::make_shared<type[]>(3);
         try {
-            a1[0].shared_from_this();
+            result[0].shared_from_this();
             BOOST_ERROR("shared_from_this did not throw");
         } catch (...) {
             BOOST_TEST(type::instances == 3);
@@ -41,9 +44,10 @@ int main()
     }
     BOOST_TEST(type::instances == 0);
     {
-        boost::shared_ptr<type[]> a1 = boost::make_shared_noinit<type[]>(3);
+        boost::shared_ptr<type[3]> result =
+            boost::make_shared_noinit<type[3]>();
         try {
-            a1[0].shared_from_this();
+            result[0].shared_from_this();
             BOOST_ERROR("shared_from_this did not throw");
         } catch (...) {
             BOOST_TEST(type::instances == 3);
diff --git a/test/make_shared_array_noinit_test.cpp b/test/make_shared_array_noinit_test.cpp
index 4942569..757e798 100644
--- a/test/make_shared_array_noinit_test.cpp
+++ b/test/make_shared_array_noinit_test.cpp
@@ -1,11 +1,11 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/align/is_aligned.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
@@ -13,142 +13,194 @@ http://boost.org/LICENSE_1_0.txt
 
 class type {
 public:
-    static unsigned int instances;
-    explicit type() {
-        instances++;
+    static unsigned instances;
+
+    type()
+        : value_(0.0) {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
+    void set(long double value) {
+        value_ = value;
+    }
+
+    long double get() const {
+        return value_;
+    }
+
 private:
     type(const type&);
     type& operator=(const type&);
+
+    long double value_;
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     {
-        boost::shared_ptr<int[]> a1 = boost::make_shared_noinit<int[]>(3);
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<int[]> result =
+            boost::make_shared_noinit<int[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<int[3]> a1 = boost::make_shared_noinit<int[3]>();
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<int[3]> result =
+            boost::make_shared_noinit<int[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<int[][2]> a1 = boost::make_shared_noinit<int[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<int[][2]> result =
+            boost::make_shared_noinit<int[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<int[2][2]> a1 = boost::make_shared_noinit<int[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<int[2][2]> result =
+            boost::make_shared_noinit<int[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[]> a1 = boost::make_shared_noinit<const int[]>(3);
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<const int[]> result =
+            boost::make_shared_noinit<const int[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[3]> a1 = boost::make_shared_noinit<const int[3]>();
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
+        boost::shared_ptr<const int[3]> result =
+            boost::make_shared_noinit<const int[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[][2]> a1 = boost::make_shared_noinit<const int[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const int[][2]> result =
+            boost::make_shared_noinit<const int[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<const int[2][2]> a1 = boost::make_shared_noinit<const int[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const int[2][2]> result =
+            boost::make_shared_noinit<const int[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
     }
     {
-        boost::shared_ptr<type[]> a1 = boost::make_shared_noinit<type[]>(3);
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[]> result =
+            boost::make_shared_noinit<type[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[3]> a1 = boost::make_shared_noinit<type[3]>();
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[3]> result =
+            boost::make_shared_noinit<type[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[3]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[3]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[][2]> a1 = boost::make_shared_noinit<type[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[][2]> result =
+            boost::make_shared_noinit<type[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<type[][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[2][2]> a1 = boost::make_shared_noinit<type[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[2][2]> result =
+            boost::make_shared_noinit<type[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<type[2][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[]> a1 = boost::make_shared_noinit<const type[]>(3);
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[]> result =
+            boost::make_shared_noinit<const type[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        boost::weak_ptr<const type[]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[3]> a1 = boost::make_shared_noinit<const type[3]>();
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[3]> result =
+            boost::make_shared_noinit<const type[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        boost::weak_ptr<const type[3]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[][2]> a1 = boost::make_shared_noinit<const type[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[][2]> result =
+            boost::make_shared_noinit<const type[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<const type[][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[2][2]> a1 = boost::make_shared_noinit<const type[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[2][2]> result =
+            boost::make_shared_noinit<const type[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        boost::weak_ptr<const type[2][2]> other = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     return boost::report_errors();
diff --git a/test/make_shared_array_test.cpp b/test/make_shared_array_test.cpp
index de74198..c6bac24 100644
--- a/test/make_shared_array_test.cpp
+++ b/test/make_shared_array_test.cpp
@@ -1,11 +1,11 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
+#include <boost/align/is_aligned.hpp>
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/smart_ptr/weak_ptr.hpp>
@@ -13,170 +13,216 @@ http://boost.org/LICENSE_1_0.txt
 
 class type {
 public:
-    static unsigned int instances;
-    explicit type() {
-        instances++;
+    static unsigned instances;
+
+    type()
+        : value_(0.0) {
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
+    void set(long double value) {
+        value_ = value;
+    }
+
+    long double get() const {
+        return value_;
+    }
+
 private:
     type(const type&);
     type& operator=(const type&);
+
+    long double value_;
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
     {
-        boost::shared_ptr<int[]> a1 = boost::make_shared<int[]>(3);
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<int[]> result =
+            boost::make_shared<int[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<int[3]> a1 = boost::make_shared<int[3]>();
-        int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<int[3]> result =
+            boost::make_shared<int[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<int[][2]> a1 = boost::make_shared<int[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<int[][2]> result =
+            boost::make_shared<int[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<int[2][2]> a1 = boost::make_shared<int[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<int[2][2]> result =
+            boost::make_shared<int[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<const int[]> a1 = boost::make_shared<const int[]>(3);
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<const int[]> result =
+            boost::make_shared<const int[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<const int[3]> a1 = boost::make_shared<const int[3]>();
-        const int* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
-        BOOST_TEST(a1[0] == 0);
-        BOOST_TEST(a1[1] == 0);
-        BOOST_TEST(a1[2] == 0);
+        boost::shared_ptr<const int[3]> result =
+            boost::make_shared<const int[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0] == 0);
+        BOOST_TEST(result[1] == 0);
+        BOOST_TEST(result[2] == 0);
     }
     {
-        boost::shared_ptr<const int[][2]> a1 = boost::make_shared<const int[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<const int[][2]> result =
+            boost::make_shared<const int[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<const int[2][2]> a1 = boost::make_shared<const int[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 0);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 0);
+        boost::shared_ptr<const int[2][2]> result =
+            boost::make_shared<const int[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<int>::value));
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 0);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 0);
     }
     {
-        boost::shared_ptr<type[]> a1 = boost::make_shared<type[]>(3);
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[]> result =
+            boost::make_shared<type[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[]> w1 = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[3]> a1 = boost::make_shared<type[3]>();
-        type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<type[3]> result =
+            boost::make_shared<type[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        boost::weak_ptr<type[3]> w1 = a1;
-        a1.reset();
+        boost::weak_ptr<type[3]> w1 = result;
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[][2]> a1 = boost::make_shared<type[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[][2]> result =
+            boost::make_shared<type[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<type[2][2]> a1 = boost::make_shared<type[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<type[2][2]> result =
+            boost::make_shared<type[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[]> a1 = boost::make_shared<const type[]>(3);
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[]> result =
+            boost::make_shared<const type[]>(3);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[3]> a1 = boost::make_shared<const type[3]>();
-        const type* a2 = a1.get();
-        BOOST_TEST(a1.use_count() == 1);
-        BOOST_TEST(a2 != 0);
-        BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
+        boost::shared_ptr<const type[3]> result =
+            boost::make_shared<const type[3]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 3);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[][2]> a1 = boost::make_shared<const type[][2]>(2);
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[][2]> result =
+            boost::make_shared<const type[][2]>(2);
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     {
-        boost::shared_ptr<const type[2][2]> a1 = boost::make_shared<const type[2][2]>();
-        BOOST_TEST(a1.get() != 0);
-        BOOST_TEST(a1.use_count() == 1);
+        boost::shared_ptr<const type[2][2]> result =
+            boost::make_shared<const type[2][2]>();
+        BOOST_TEST(result.get() != 0);
+        BOOST_TEST(result.use_count() == 1);
+        BOOST_TEST(boost::alignment::is_aligned(result.get(),
+            boost::alignment_of<type>::value));
         BOOST_TEST(type::instances == 4);
-        a1.reset();
+        result.reset();
         BOOST_TEST(type::instances == 0);
     }
     return boost::report_errors();
diff --git a/test/make_shared_array_throws_test.cpp b/test/make_shared_array_throws_test.cpp
index 56c7372..a754360 100644
--- a/test/make_shared_array_throws_test.cpp
+++ b/test/make_shared_array_throws_test.cpp
@@ -1,32 +1,34 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 class type {
 public:
-    static unsigned int instances;
-    explicit type() {
+    static unsigned instances;
+
+    type() {
         if (instances == 5) {
             throw true;
         }
-        instances++;
+        ++instances;
     }
+
     ~type() {
-        instances--;
+        --instances;
     }
+
 private:
     type(const type&);
     type& operator=(const type&);
 };
 
-unsigned int type::instances = 0;
+unsigned type::instances = 0;
 
 int main()
 {
diff --git a/test/make_shared_array_value_test.cpp b/test/make_shared_array_value_test.cpp
index 185605d..44d12d3 100644
--- a/test/make_shared_array_value_test.cpp
+++ b/test/make_shared_array_value_test.cpp
@@ -1,10 +1,9 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
@@ -12,32 +11,36 @@ http://boost.org/LICENSE_1_0.txt
 int main()
 {
     {
-        boost::shared_ptr<int[]> a1 = boost::make_shared<int[]>(4, 1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<int[]> result =
+            boost::make_shared<int[]>(4, 1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     {
-        boost::shared_ptr<int[4]> a1 = boost::make_shared<int[4]>(1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<int[4]> result =
+            boost::make_shared<int[4]>(1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     {
-        boost::shared_ptr<const int[]> a1 = boost::make_shared<const int[]>(4, 1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<const int[]> result =
+            boost::make_shared<const int[]>(4, 1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     {
-        boost::shared_ptr<const int[4]> a1 = boost::make_shared<const int[4]>(1);
-        BOOST_TEST(a1[0] == 1);
-        BOOST_TEST(a1[1] == 1);
-        BOOST_TEST(a1[2] == 1);
-        BOOST_TEST(a1[3] == 1);
+        boost::shared_ptr<const int[4]> result =
+            boost::make_shared<const int[4]>(1);
+        BOOST_TEST(result[0] == 1);
+        BOOST_TEST(result[1] == 1);
+        BOOST_TEST(result[2] == 1);
+        BOOST_TEST(result[3] == 1);
     }
     return boost::report_errors();
 }
diff --git a/test/make_shared_arrays_test.cpp b/test/make_shared_arrays_test.cpp
index 7cd067f..0022e01 100644
--- a/test/make_shared_arrays_test.cpp
+++ b/test/make_shared_arrays_test.cpp
@@ -1,45 +1,53 @@
 /*
-(c) 2012-2015 Glen Joseph Fernandes
-<glenjofe -at- gmail.com>
+Copyright 2012-2015 Glen Joseph Fernandes
+(glenjofe@gmail.com)
 
-Distributed under the Boost Software
-License, Version 1.0.
-http://boost.org/LICENSE_1_0.txt
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/core/lightweight_test.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
+#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
 int main()
 {
-#if !defined(BOOST_NO_CXX11_UNIFIED_INITIALIZATION_SYNTAX)
     {
-        boost::shared_ptr<int[][2]> a1 = boost::make_shared<int[][2]>(2, {0, 1});
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<int[][2]> result =
+            boost::make_shared<int[][2]>(2, {0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
     {
-        boost::shared_ptr<int[2][2]> a1 = boost::make_shared<int[2][2]>({ 0, 1 });
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<int[2][2]> result =
+            boost::make_shared<int[2][2]>({0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
     {
-        boost::shared_ptr<const int[][2]> a1 = boost::make_shared<const int[][2]>(2, { 0, 1 });
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<const int[][2]> result =
+            boost::make_shared<const int[][2]>(2, {0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
     {
-        boost::shared_ptr<const int[2][2]> a1 = boost::make_shared<const int[2][2]>({ 0, 1 });
-        BOOST_TEST(a1[0][0] == 0);
-        BOOST_TEST(a1[0][1] == 1);
-        BOOST_TEST(a1[1][0] == 0);
-        BOOST_TEST(a1[1][1] == 1);
+        boost::shared_ptr<const int[2][2]> result =
+            boost::make_shared<const int[2][2]>({0, 1});
+        BOOST_TEST(result[0][0] == 0);
+        BOOST_TEST(result[0][1] == 1);
+        BOOST_TEST(result[1][0] == 0);
+        BOOST_TEST(result[1][1] == 1);
     }
-#endif
     return boost::report_errors();
 }
+#else
+int main()
+{
+    return 0;
+}
+#endif