1 files changed, 20 insertions, 16 deletions

diff --git a/ue5/array.hpp b/ue5/array.hpp
index 37a33b4..279ad7d 100644
--- a/ue5/array.hpp
+++ b/ue5/array.hpp
@@ -4,35 +4,39 @@
 #undef SOLVED_2
 #define SOLVED_2
 
-/* TODO:
- * Angabe: Im Gegensatz zu den Beispielen bis jetzt ist die Verwendung
- *         der STL und Boostuntersagt!
- */
 #include <utility> // for std::move
 #include <stdexcept> // for std::out_of_range
-#include <algorithm> // for std::fill_n + std::swap_ranges
 
 namespace Ti
 {
-  template<typename T, size_t N>
+  template<typename T, std::size_t N>
     struct array
     {
       typedef T& reference;
       typedef const T& const_reference;
       typedef T* iterator;
       typedef const T* const_iterator;
-      typedef size_t size_type;
+      typedef std::size_t size_type;
 
       static_assert(N != 0, "array<T, 0> not allowed");
 
-      void fill (const T& u)
+      void fill(const T& u)
       {
-        std::fill_n(begin(), size(), u);
+        for(size_type i = 0; i < size(); ++i)
+          m_data[i] = u;
+        /* std::fill_n(begin(), size(), u); */
       }
 
-      void swap (array<T,N> & other)
+      /* 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 < size(); ++i)
+        {
+          T x(m_data[i]);
+          m_data[i] = other[i];
+          other[i] = x;
+        }
+        /* std::swap_ranges(begin(), end(), other.begin()); */
       }
 
       iterator begin()
@@ -70,12 +74,12 @@ namespace Ti
         return false; /* size() == 0 */
       }
 
-      reference operator[] (size_type n)
+      reference operator[](size_type n)
       {
         return m_data[n];
       }
 
-      const_reference operator[] (size_type n) const
+      const_reference operator[](size_type n) const
       {
         return m_data[n];
       }
@@ -87,7 +91,7 @@ namespace Ti
         return m_data[n];
       }
 
-      const_reference at (size_type n) const
+      const_reference at(size_type n) const
       {
         if (n >= size())
           throw std::out_of_range("array::at");
@@ -103,8 +107,8 @@ namespace Ti
         T m_data[N];
     };
 
-  /* TODO: was macht std::move() genau?! :) */
-  template<typename T, size_t N>
+  /* std::move returns lvalue as rvalue */
+  template<typename T, std::size_t N>
     array<T, N>&& make_array()
   {
     return std::move(array<T, N>());