Changeset 448 for trunk

Timestamp:

07/30/15 14:05:17 (10 years ago)

Author:

epyon

Message:

• algorithm/remove added
• some namespace anti-adl fixes (should be everywhere?)
• growing_storage range constructor
• minor fix in gui_style

Location:

trunk

Files:

• nv/stl/algorithm.hh (modified) (4 diffs)
• nv/stl/container/growing_storage.hh (modified) (1 diff)
• src/gui/gui_style.cc (modified) (1 diff)

trunk/nv/stl/algorithm.hh

@@ -148 +148 @@
         }
 
+        template < typename ForwardIterator, typename T >
+        inline ForwardIterator remove( ForwardIterator first, ForwardIterator last, const T& value )
+        {
+                ForwardIterator next = ::nv::find( first, last, value );
+                if ( next != last )
+                {
+                        first = next;
+                        for ( ++first; first != last; ++first )
+                                if ( !( *first == value ) )
+                                        *next++ = ::nv::move( *first );
+                }
+                return next;
+        }
+
         template < typename Iterator >
         inline void iter_swap( Iterator a, Iterator b )
         {
-                swap( *a, *b );
+                ::nv::swap( *a, *b );
         }
 
@@ -158 +172 @@
         {
                 for ( ; ::nv::distance( first, --last ) > 0; ++first )
-                        iter_swap( first, last );
+                        ::nv::iter_swap( first, last );
         }
 
@@ -166 +180 @@
                 if ( first == middle || middle == last )
                         return first;
-                reverse( first, middle );
-                reverse( middle, last );
+                ::nv::reverse( first, middle );
+                ::nv::reverse( middle, last );
                 for ( ; first != middle && middle != last; ++first )
-                        iter_swap( first, --last );
-                reverse( first, ( first == middle ? last : middle ) );
+                        ::nv::iter_swap( first, --last );
+                ::nv::reverse( first, ( first == middle ? last : middle ) );
                 return first;
         }
@@ -184 +198 @@
                 {
                         for ( j = i; j-- > first && comp( *i, *j ); );
-                        if ( ++j != i ) rotate( j, i, i + 1 );
+                        if ( ++j != i ) ::nv::rotate( j, i, i + 1 );
                 }
         }

trunk/nv/stl/container/growing_storage.hh

@@ -110 +110 @@
                 }
 
+                template< typename InputIterator >
+                growing_storage( InputIterator first, InputIterator last )
+                {
+                        assign( first, last );
+                }
+
                 inline growing_storage& operator=( growing_storage&& other )
                 {

trunk/src/gui/gui_style.cc

@@ -119 +119 @@
         lua::stack_guard guard( m_lua );
         lua_getglobal( m_lua, "default" );
-        int global = lua_gettop( m_lua );
 
         // check id