update

[l4.git] / kernel / fiasco / src / kern / kobject_dbg.cpp

diff --git a/kernel/fiasco/src/kern/kobject_dbg.cpp b/kernel/fiasco/src/kern/kobject_dbg.cpp
index 7d1b150366428ac9c4fac539c9472409dec791d9..3da3a2626d171409d79c83f3878d224f499ce5bc 100644 (file)
--- a/kernel/fiasco/src/kern/kobject_dbg.cpp
+++ b/kernel/fiasco/src/kern/kobject_dbg.cpp
@@ -9,8 +9,8 @@ INTERFACE[debug]:
 
 #include "spin_lock.h"
 #include "lock_guard.h"
-#include <dlist>
-#include <hlist>
+#include <cxx/dlist>
+#include <cxx/hlist>
 
 class Kobject;
 
@@ -118,7 +118,7 @@ Kobject_dbg::obj_to_id(void const *o)
 PROTECTED
 Kobject_dbg::Kobject_dbg()
 {
-  Lock_guard<decltype(_kobjects_lock)> guard(&_kobjects_lock);
+  auto guard = lock_guard(_kobjects_lock);
 
   _dbg_id = _next_dbg_id++;
   _kobjects.push_back(this);
@@ -128,7 +128,7 @@ IMPLEMENT inline
 Kobject_dbg::~Kobject_dbg()
 {
     {
-      Lock_guard<decltype(_kobjects_lock)> guard(&_kobjects_lock);
+      auto guard = lock_guard(_kobjects_lock);
       _kobjects.remove(this);
     }