--- a/TaskManager/kernel/ppe/TaskManagerImpl.cc	Fri Feb 15 18:51:35 2008 +0900
+++ b/TaskManager/kernel/ppe/TaskManagerImpl.cc	Fri Feb 15 19:36:08 2008 +0900
@@ -10,11 +10,18 @@
 
 TaskManagerImpl::TaskManagerImpl(int num) : machineNum(num) {}
 
+TaskManagerImpl::~TaskManagerImpl(void)
+{
+    delete mailManager;
+    delete scheduler;
+    delete taskInfo;
+}
+
 void
 TaskManagerImpl::init(void)
 {
     mailManager = new MailManager();
-    mailManager->init_pool_mailQueue(20);
+    mailManager->init(20);
 
     scheduler = new MainScheduler();
     scheduler->init();
@@ -116,12 +123,12 @@
     // »ÃÄê
     list = set_task();
 
-    list_mail =	mailManager->create_mail((unsigned int)list);
-    in_mail_list = append_mailQueue(in_mail_list, list_mail);
+    list_mail =	mailManager->create((unsigned int)list);
+    in_mail_list = MailManager::append_mailQueue(in_mail_list, list_mail);
 
     do {
-	sentinel  = mailManager->create_mail(MY_SPE_COMMAND_EXIT);
-	in_mail_list = append_mailQueue(in_mail_list, sentinel);
+	sentinel  = mailManager->create(MY_SPE_COMMAND_EXIT);
+	in_mail_list = MailManager::append_mailQueue(in_mail_list, sentinel);
 
 	scheduler->send_mailList(in_mail_list);
 	scheduler->run();
@@ -151,8 +158,8 @@
 	    __debug_ppe("[FIFO] finish\n");
 	    next_list = set_task();
 	    if (next_list != NULL) {
-		d = mailManager->create_mail((unsigned int)next_list);
-		ret = append_mailQueue(ret, d);
+		d = mailManager->create((unsigned int)next_list);
+		ret = MailManager::append_mailQueue(ret, d);
 	    }
 	} else {
 	    __debug_ppe("[PPE] recv from : 0x%x\n", data);
@@ -162,7 +169,7 @@
 	d = q;
 	q = q->next;
 
-	mailManager->free_mailQueue(d);
+	mailManager->free(d);
     }
 
     return ret;