Mercurial > hg > Members > kono > Cerium

changeset 447:6dd11969f8b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix...
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 25 Sep 2009 07:40:09 +0900
parents e1d1be9c1d75
children 0ef430eff384
files TaskManager/Test/test_render/Application.cc TaskManager/Test/test_render/Application.h TaskManager/Test/test_render/Application/Chain.h TaskManager/Test/test_render/Application/chain.cc TaskManager/Test/test_render/Application/chain_old.cc
diffstat 5 files changed, 16 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Application.cc	Fri Sep 25 07:29:15 2009 +0900
+++ b/TaskManager/Test/test_render/Application.cc	Fri Sep 25 07:40:09 2009 +0900
@@ -75,3 +75,11 @@
     return NULL;
 }
 
+
+void Application::init(TaskManager *manager, int w, int h) {
+}
+
+int Application::move_task_id() {
+    return 0;
+}
+
--- a/TaskManager/Test/test_render/Application.h	Fri Sep 25 07:29:15 2009 +0900
+++ b/TaskManager/Test/test_render/Application.h	Fri Sep 25 07:40:09 2009 +0900
@@ -23,9 +23,9 @@
     //SceneGraphPtr scenegraph_connector(PropertyPtr p,SceneGraphPtr s);
     SceneGraphPtr scenegraph_factory(void *p, int size);
     SceneGraphPtr scenegraph_connector(void *p, int size, SceneGraphPtr s, SceneGraphPtr sg_available_list);
-    void init(TaskManager *manager, int w, int h);
+    virtual void init(TaskManager *manager, int w, int h) ;
 
-    virtual int move_task_id();
+    virtual int move_task_id() ;
 
 };
 
--- a/TaskManager/Test/test_render/Application/Chain.h	Fri Sep 25 07:29:15 2009 +0900
+++ b/TaskManager/Test/test_render/Application/Chain.h	Fri Sep 25 07:40:09 2009 +0900
@@ -19,7 +19,7 @@
     SceneGraphPtr scenegraph_connector(void *p, int size, SceneGraphPtr s, SceneGraphPtr sg_available_list);
     void init(TaskManager *manager, int w, int h);
     
-    int move_task_id();
+    virtual int move_task_id();
     int move_task_id_;
 
     void init_chain_vars(ChainPropertyPtr cv);
--- a/TaskManager/Test/test_render/Application/chain.cc	Fri Sep 25 07:29:15 2009 +0900
+++ b/TaskManager/Test/test_render/Application/chain.cc	Fri Sep 25 07:40:09 2009 +0900
@@ -23,15 +23,14 @@
 SceneGraphPtr scenegraph_factory(void *p, int size){ 
     return 0;
 }
+
 SceneGraphPtr scenegraph_connector(void *p, int size, SceneGraphPtr s, SceneGraphPtr sg_available_list){
     return 0;
 }
-void init(TaskManager *manager, int w, int h){
-    return;
-}
 
-int move_task_id(){
-    return 0;
+int 
+Chain::move_task_id(){
+    return move_task_id_;
 }
 
 
--- a/TaskManager/Test/test_render/Application/chain_old.cc	Fri Sep 25 07:29:15 2009 +0900
+++ b/TaskManager/Test/test_render/Application/chain_old.cc	Fri Sep 25 07:40:09 2009 +0900
@@ -1,4 +1,4 @@
-#include <iostream.h>
+#include <iostream>
 #include <math.h>
 #include "SceneGraphRoot.h"
 #include "SGList.h"