3 files changed, 13 insertions, 64 deletions

diff --git a/ue5/array.hpp b/ue5/array.hpp
index e9adc55..0acd37d 100644
--- a/ue5/array.hpp
+++ b/ue5/array.hpp
@@ -1,12 +1,13 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
+#include <utility>
+#include <algorithm>
+#include <stdexcept>
+
 #undef SOLVED_2
 #define SOLVED_2
 
-#include <utility> // for std::move
-#include <stdexcept> // for std::out_of_range
-
 namespace Ti
 {
   template<typename T, std::size_t N>
@@ -22,21 +23,12 @@ namespace Ti
 
       void fill(const T& u)
       {
-        /* std::fill_n(begin(), size(), u); */
-        for(size_type i = 0; i < N; ++i)
-          m_data[i] = u;
+        std::fill_n(begin(), N, u);
       }
 
-      /* range check not necessary. N must be the same in other */
       void swap(array<T,N> & other)
       {
-        /* std::swap_ranges(begin(), end(), other.begin()); */
-        for(size_type i = 0; i < N; ++i)
-        {
-          T x(m_data[i]);
-          m_data[i] = other.m_data[i];
-          other.m_data[i] = x;
-        }
+        std::swap_ranges(begin(), end(), other.begin());
       }
 
       iterator begin()
diff --git a/ue5/mean_mark.hpp b/ue5/mean_mark.hpp
index ba5a230..a28b219 100644
--- a/ue5/mean_mark.hpp
+++ b/ue5/mean_mark.hpp
@@ -1,6 +1,8 @@
 #ifndef MEAN_MARK_H
 #define MEAN_MARK_H
 
+#include <typeinfo>
+
 #undef SOLVED_3
 #define SOLVED_3
 
diff --git a/ue5/shared_ptr.hpp b/ue5/shared_ptr.hpp
index 00a4dc7..e423904 100644
--- a/ue5/shared_ptr.hpp
+++ b/ue5/shared_ptr.hpp
@@ -1,19 +1,13 @@
 #ifndef SHARED_PTR_H
 #define SHARED_PTR_H
 
-/* TODO includes */
+#include <algorithm>
 
 #undef SOLVED_1
 #define SOLVED_1
 
-/* TODO: remove */
-#define SHPDEBUG if (0)
-#include <iostream>
-
 namespace Ti
 {
-  /* TODO helpers */
-
   template <typename T>
     class shared_ptr
     {
@@ -24,20 +18,16 @@ namespace Ti
       public:
         shared_ptr()
           : m_ptr(NULL), m_count(NULL)
-        {
-          SHPDEBUG std::cerr << this << ": shared_ptr()" << std::endl;
-        }
+        {}
 
         T* get() const
         {
-          SHPDEBUG std::cerr << this << ": get()" << std::endl;
           return m_ptr;
         }
 
         shared_ptr(const shared_ptr<T>& other)
           : m_ptr(other.m_ptr), m_count(other.m_count)
         {
-          SHPDEBUG std::cerr << this << ": shared_ptr(shared_ptr<T>& other)" << std::endl;
           add_ref();
         }
 
@@ -45,7 +35,6 @@ namespace Ti
           shared_ptr(const shared_ptr<O>& other)
             : m_ptr(other.m_ptr), m_count(other.m_count)
           {
-            SHPDEBUG std::cerr << this << ": shared_ptr(shared_ptr<O>& other)" << std::endl;
             add_ref();
           }
 
@@ -54,59 +43,39 @@ namespace Ti
           shared_ptr(const shared_ptr<O>& other, T* ptr)
             : m_ptr(ptr), m_count(other.m_count)
           {
-            SHPDEBUG std::cerr << this << ": shared_ptr(shared_ptr<O>& other, O* ptr)" << std::endl;
             add_ref();
           }
 
         template <typename O>
           explicit shared_ptr(O* p)
           : m_ptr(p), m_count(new unsigned long(1))
-          {
-            SHPDEBUG std::cerr << this << ": shared_ptr(O* p)" << std::endl;
-          }
+          {}
 
         shared_ptr& operator=(const shared_ptr<T>& other)
         {
-          SHPDEBUG std::cerr << this << ": operator=(shared_ptr<T>& other)" << std::endl;
-#if 1
-          shared_ptr(other).swap(*this);
-          return *this;
-#else
           if (*this == other)
             return *this;
-
           release();
-
           m_ptr = other.m_ptr;
           m_count = other.m_count;
           add_ref();
           return *this;
-#endif
         }
 
         template <typename O>
           shared_ptr& operator=(const shared_ptr<O>& other)
         {
-          SHPDEBUG std::cerr << this << ": operator=(shared_ptr<O>& other)" << std::endl;
-#if 0
-          shared_ptr(other).swap(*this);
-          return *this;
-#else
           if (*this == other)
             return *this;
-
           release();
-
           m_ptr = other.m_ptr;
           m_count = other.m_count;
           add_ref();
           return *this;
-#endif
         }
 
         ~shared_ptr()
         {
-          SHPDEBUG std::cerr << this << ": ~shared_ptr()" << std::endl;
           release();
         }
 
@@ -122,15 +91,8 @@ namespace Ti
 
         void swap(shared_ptr<T>& other)
         {
-          /* std::swap(m_ptr, other.m_ptr); */
-          T* ptr(m_ptr);
-          m_ptr = other.m_ptr;
-          other.m_ptr = ptr;
-
-          /* std::swap(m_count, other.m_count); */
-          unsigned long* count(m_count);
-          m_count = other.m_count;
-          other.m_count = count;
+          std::swap(m_ptr, other.m_ptr);
+          std::swap(m_count, other.m_count);
         }
 
         inline void reset()
@@ -188,7 +150,6 @@ namespace Ti
   template <typename T, typename ... Args>
     shared_ptr<T> make_shared(Args ... args)
     {
-      SHPDEBUG std::cerr << "make_shared(args...)" << std::endl;
       return shared_ptr<T>(new T(args ...));
     }
 
@@ -231,16 +192,12 @@ namespace Ti
   template <typename T, typename F>
     shared_ptr<T> shared_dynamic_cast(const shared_ptr<F>& from)
     {
-      SHPDEBUG std::cerr << "shared_dynamic_cast(...)" << std::endl;
       T* castptr = dynamic_cast<T *>(from.get());
       if (castptr != NULL)
-      {
         return shared_ptr<T>(from, castptr);
-      }
       else
         return shared_ptr<T>();
     }
-
 } // end namespace ti
 
 namespace std
@@ -251,8 +208,6 @@ namespace std
     {
       t1.swap(t2);
     }
-
-  /* TODO */
 }
 
 #endif