Mercurial > hg > Members > kono > Cerium

diff TaskManager/kernel/main.cc @ 273:3e9c0039e15c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 04 Jun 2009 00:12:47 +0900
parents f872cc000fe0
children 181f693be3d5
line wrap: on
line diff
--- a/TaskManager/kernel/main.cc	Thu Jun 04 00:08:48 2009 +0900
+++ b/TaskManager/kernel/main.cc	Thu Jun 04 00:12:47 2009 +0900
@@ -1,6 +1,5 @@
 #include <stdlib.h>
-//#include <string.h>
-#include <string>
+#include <string.h>
 #include <SDL.h>
 #include "TaskManager.h"
 
@@ -12,15 +11,7 @@
 defaultTMend(void) {}
 
 TaskManager *manager;
-<<<<<<< local
-<<<<<<< local
-static std::string help_str = "\n\
-=======
-static char help_str[] = "\n\
->>>>>>> other
-=======
 const char *help_str = "\n\
->>>>>>> other
 * Cerium program option *\n\
   -help Print this message \n\
   -cpu   Number of CPU (default 1) \n";