Changeset 485 for trunk/nv/core/resource.hh

Timestamp:

01/26/16 18:59:46 (9 years ago)

Author:

epyon

Message:

• massive update (need to start doing atomics again) :/

File:

• trunk/nv/core/resource.hh (modified) (4 diffs)

trunk/nv/core/resource.hh

@@ -18 +18 @@
 #include <nv/stl/hash_store.hh>
 #include <nv/stl/vector.hh>
+
+#include <nv/core/logging.hh>
 
 
@@ -77 +79 @@
         {
         public:
-                resource() : m_id(0), m_handler( nullptr ) {}
+                resource() : m_id(), m_handler( nullptr ) {}
                 resource_id id() const { return m_id; }
                 constexpr bool is_valid() const { return m_id && m_handler; }
@@ -214 +216 @@
                         if ( m->second->exists( id ) || m->second->load_resource( id ) )
                                 return m->second->create< T >( id );
-                        // NV_ASSERT( false, "resource_manager.get failed!" );
+                        NV_ASSERT( false, "resource_manager.get failed!" );
                         return resource< T >();
                 }
@@ -227 +229 @@
                                 return m->second->create< T >( id );
                         }
-                        // NV_ASSERT( false, "resource_manager.get failed!" );
+                        NV_ASSERT( false, "resource_manager.get failed!" );
                         return resource< T >();
                 }