update

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

diff --git a/kernel/fiasco/src/kern/kobject_helper.cpp b/kernel/fiasco/src/kern/kobject_helper.cpp
index 6964efbbf16278c4a29153610b697140d195a707..024e7d0e8942528de5aee3ec11b0ebe4b9f76e27 100644 (file)
--- a/kernel/fiasco/src/kern/kobject_helper.cpp
+++ b/kernel/fiasco/src/kern/kobject_helper.cpp
@@ -4,8 +4,11 @@ INTERFACE:
 #include "thread.h"
 #include <cxx/type_traits>
 
+template<typename T, typename Base = Kobject> class Kobject_h;
+
 class Kobject_helper_base
 {
+  template<typename T, typename Base> friend class Kobject_h;
 protected:
   static Mword _utcb_dummy[];
   static Utcb *utcb_dummy()
@@ -14,17 +17,19 @@ protected:
     return reinterpret_cast<Utcb*>(x);
   }
 
-  static L4_msg_tag no_reply() { return L4_msg_tag(L4_msg_tag::Schedule); }
-  static bool have_receive(Utcb *rcv) { return rcv != utcb_dummy(); }
 };
 
-template<typename T, typename Base = Kobject>
-class Kobject_h : public Base, protected Kobject_helper_base
+template<typename T, typename Base>
+class Kobject_h : public Base
 {
 private:
   static Sender *_sender(Thread *, Sender *t) { return t; }
   static Sender *_sender(Thread *ct, ...) { return ct; }
 
+protected:
+  static L4_msg_tag no_reply() { return L4_msg_tag(L4_msg_tag::Schedule); }
+  static bool have_receive(Utcb *rcv) { return rcv != Kobject_helper_base::utcb_dummy(); }
+
 public:
 
   explicit Kobject_h() {}
@@ -37,7 +42,7 @@ public:
     L4_msg_tag res(no_reply());
     if (EXPECT_TRUE(self.op() & L4_obj_ref::Ipc_send))
       res = static_cast<T*>(this)->T::kinvoke(self, rights, f, (Utcb const *)u,
-                                              self.have_recv() ? u : utcb_dummy());
+                                              self.have_recv() ? u : Kobject_helper_base::utcb_dummy());
 
     if (EXPECT_FALSE(res.has_error()))
       {