Changeset 64 for trunk/src/object.cc

Timestamp:

05/30/13 20:13:08 (12 years ago)

Author:

epyon

Message:

• root class for object trees
• revised exception throwing - now using NV_THROW macro
• exceptions thrown are logged
• formatting fixes

File:

• trunk/src/object.cc (modified) (3 diffs)

trunk/src/object.cc

@@ -7 +7 @@
 #include "nv/object.hh"
 
+#include "nv/root.hh"
 #include "nv/types.hh"
 
@@ -12 +13 @@
 
 object::object()
-        : m_id(), m_name(), m_uid(0), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
+        : m_root( nullptr ), m_id(), m_name(), m_uid(0), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
 {
 //      m_uid = uid_store::get_free_uid();
@@ -18 +19 @@
 }
 
-object::object( string aid, uid auid )
-        : m_id(aid), m_name(), m_uid( auid ), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
+object::object( root* aroot, const string& aid, uid auid )
+        : m_root( aroot ), m_id(aid), m_name(), m_uid( auid ), m_lua_index(-2), m_parent( nullptr ), m_children(), m_child_count(0)
 {
         //      uid_store::register_object( this, auid );