Update

[l4.git] / l4 / pkg / io / io / server / src / inhibitor_mux.h

diff --git a/l4/pkg/io/server/src/inhibitor_mux.h b/l4/pkg/io/io/server/src/inhibitor_mux.h
similarity index 96%
rename from l4/pkg/io/server/src/inhibitor_mux.h
rename to l4/pkg/io/io/server/src/inhibitor_mux.h
index 4cbb7b1f197bf6dad9434da15c2390c1dc76f35e..294851fbc76e72bfe6aad267ecb383b8791ecab9 100644 (file)
--- a/l4/pkg/io/server/src/inhibitor_mux.h
+++ b/l4/pkg/io/io/server/src/inhibitor_mux.h
@@ -10,7 +10,6 @@
 #pragma once
 
 #include <l4/cxx/hlist>
-#include <l4/cxx/ipc_stream>
 #include <l4/vbus/vbus_inhibitor.h>
 #include <l4/sys/types.h>
 
@@ -41,7 +40,6 @@ protected:
   { return _inhibitor_acquired[id]; }
 
   void inhibitor_acquire(l4_umword_t id, char const *reason);
-  void inhibitor_acquire(L4::Ipc::Istream &in);
   void inhibitor_release(l4_umword_t id);
 
   virtual ~Inhibitor_provider() = 0;
@@ -135,7 +133,7 @@ public:
 
 private:
   friend class Inhibitor_provider;
-  typedef cxx::H_list<Inhibitor_provider> Client_list;
+  typedef cxx::H_list_t<Inhibitor_provider> Client_list;
 
   void inhibitor_acquire(l4_umword_t id);
   void inhibitor_release(l4_umword_t id);