resolve Conflicts

	bsp/nrf52832/board/Sconscript
	bsp/nrf52832/startups/Sconscript
	bsp/raspberry-pi/raspi4-32/driver/SConscript

1 files changed, 1 insertions, 13 deletions

diff --git a/src/object.c b/src/object.c
index 6866d805ca..56263618b3 100644
--- a/src/object.c
+++ b/src/object.c
@@ -192,18 +192,6 @@ void rt_object_put_sethook(void (*hook)(struct rt_object *object))
 #endif
 
 /**
- * @ingroup SystemInit
- *
- * This function will initialize system object management.
- *
- * @deprecated since 0.3.0, this function does not need to be invoked
- * in the system initialization.
- */
-void rt_system_object_init(void)
-{
-}
-
-/**
  * @addtogroup KernelObject
  */
 
@@ -485,7 +473,7 @@ void rt_object_delete(rt_object_t object)
     RT_OBJECT_HOOK_CALL(rt_object_detach_hook, (object));
 
     /* reset object type */
-    object->type = 0;
+    object->type = RT_Object_Class_Null;
 
     /* lock interrupt */
     temp = rt_hw_interrupt_disable();