Changeset 339

Timestamp:

09/23/14 02:04:41 (11 years ago)

Author:

epyon

Message:

• handle - index_store/entity_store is_valid added
• handle - packed_indexed_array will silently ignore invalid removes

File:

• trunk/nv/core/handle.hh (modified) (3 diffs)

trunk/nv/core/handle.hh

@@ -103 +103 @@
                 {
                         std::swap( m_entries[ h1.index() ].index, m_entries[ h2.index() ].index );
+                }
+
+                bool is_valid( handle h ) const
+                {
+                        typedef handle_operator<HANDLE> hop; 
+                        if ( h.is_nil() ) return false;
+                        if ( h.index() >= m_entries.size() ) return false;
+                        const index_entry& entry = m_entries[ h.index() ];
+                        return entry.index >= 0 && entry.counter == hop::get_counter(h);
                 }
 
@@ -183 +192 @@
                 void remove( handle h )
                 {
+                        if ( h.is_nil() || h.index() >= m_indexes.size() || m_indexes[h.index()] == -1 ) 
+                                return;
                         handle swap_handle    = m_handles.back();
                         sint32 dead_eindex    = m_indexes[ h.index() ];
@@ -259 +270 @@
                         m_handles.push_back( m_indexes.create_handle( sint32( m_data.size() - 1 ) ) );
                         return m_handles.back();
+                }
+
+                bool is_valid( handle h )
+                {
+                        return m_indexes.is_valid(h);
                 }