Changeset 323 for trunk/nv/core/array.hh

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

• trunk/nv/core/array.hh (modified) (2 diffs)

trunk/nv/core/array.hh

@@ -16 +16 @@
 #include <nv/core/common.hh>
 #include <vector>
+#include <algorithm>
 #include <array>
 
 namespace nv
 {
-        namespace detail
-        {
-                template < typename T >
-                class array_base
-                {
-                public:
-                        typedef T              value_type;
-                        typedef T*             iterator;
-                        typedef const T*       const_iterator;
-                        typedef T&             reference;
-                        typedef const T&       const_reference;
-                        typedef std::size_t    size_type;
-                        typedef std::ptrdiff_t difference_type;
-
-                        typedef std::reverse_iterator<iterator>       reverse_iterator;
-                        typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-                };
-        }
-
         using std::vector;
         using std::array;
 
         template< class T, std::size_t N >
-        class static_array : public detail::array_base<T>
+        class static_array
         {
         public:
+                typedef T              value_type;
+                typedef T*             iterator;
+                typedef const T*       const_iterator;
+                typedef T&             reference;
+                typedef const T&       const_reference;
+                typedef std::size_t    size_type;
+                typedef std::ptrdiff_t difference_type;
+
+                typedef std::reverse_iterator<iterator>       reverse_iterator;
+                typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
                 iterator        begin()        { return m_data; }
                 const_iterator  begin()  const { return m_data; }
@@ -99 +92 @@
 
         template< class T >
-        class dynamic_array : public detail::array_base<T>
+        class dynamic_array
         {
         public:
+                typedef T              value_type;
+                typedef T*             iterator;
+                typedef const T*       const_iterator;
+                typedef T&             reference;
+                typedef const T&       const_reference;
+                typedef std::size_t    size_type;
+                typedef std::ptrdiff_t difference_type;
+
+                typedef std::reverse_iterator<iterator>       reverse_iterator;
+                typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+
                 dynamic_array() 
                         : m_data( nullptr ), m_size(0) {}