# HG changeset patch # User e065746@localhost.localdomain # Date 1243754780 -32400 # Node ID c4918a1fb6c9f485574094908a2440a734d405cf # Parent 23e76c5369b76544ea19d17ba75bf309fd47a876 rm warning diff -r 23e76c5369b7 -r c4918a1fb6c9 TaskManager/Test/test_render/SceneGraph.cpp --- a/TaskManager/Test/test_render/SceneGraph.cpp Sun May 31 15:55:00 2009 +0900 +++ b/TaskManager/Test/test_render/SceneGraph.cpp Sun May 31 16:26:20 2009 +0900 @@ -426,7 +426,7 @@ /* thisの子や子孫にnameのものが存在すればそいつを返す なければNULL. */ SceneGraphPtr -SceneGraph::searchSceneGraph(char *name) +SceneGraph::searchSceneGraph(const char *name) { SceneGraphPtr tmp; SceneGraphPtr result; diff -r 23e76c5369b7 -r c4918a1fb6c9 TaskManager/Test/test_render/SceneGraph.h --- a/TaskManager/Test/test_render/SceneGraph.h Sun May 31 15:55:00 2009 +0900 +++ b/TaskManager/Test/test_render/SceneGraph.h Sun May 31 16:26:20 2009 +0900 @@ -70,7 +70,7 @@ SceneGraphPtr addBrother(SceneGraphPtr bro); SceneGraphPtr clone(void); SceneGraphPtr clone(void *buf); - SceneGraphPtr searchSceneGraph(char *name); + SceneGraphPtr searchSceneGraph(const char *name); void set_move_collision(SceneGraphPtr node, move_func new_move, collision_func new_collision); void set_move_collision(move_func new_move, collision_func new_collision); diff -r 23e76c5369b7 -r c4918a1fb6c9 TaskManager/Test/test_render/polygon.h --- a/TaskManager/Test/test_render/polygon.h Sun May 31 15:55:00 2009 +0900 +++ b/TaskManager/Test/test_render/polygon.h Sun May 31 16:26:20 2009 +0900 @@ -22,8 +22,8 @@ class Polygon { public: long long size; - char *name; - char *parent_name; + const char *name; + const char *parent_name; //float *data; //"vertex" and "normal" and "texture" float *coord_xyz; // vertex coordinate array diff -r 23e76c5369b7 -r c4918a1fb6c9 TaskManager/Test/test_render/spe/DrawSpan.cpp --- a/TaskManager/Test/test_render/spe/DrawSpan.cpp Sun May 31 15:55:00 2009 +0900 +++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp Sun May 31 16:26:20 2009 +0900 @@ -184,7 +184,7 @@ tile->texture_addr = addr; - int index = hash->put(tile->texture_addr, tile); + hash->put(tile->texture_addr, tile); smanager->dma_load(tile->pixel, (uint32)addr, sizeof(uint32)*TEXTURE_BLOCK_SIZE, tag); } diff -r 23e76c5369b7 -r c4918a1fb6c9 TaskManager/Test/test_render/spe/DrawSpanRenew.cpp --- a/TaskManager/Test/test_render/spe/DrawSpanRenew.cpp Sun May 31 15:55:00 2009 +0900 +++ b/TaskManager/Test/test_render/spe/DrawSpanRenew.cpp Sun May 31 16:26:20 2009 +0900 @@ -216,7 +216,6 @@ free(zRow); free(args); -FINISH: /** * linebuf, zRow, args RenewTask Ѥ */ diff -r 23e76c5369b7 -r c4918a1fb6c9 TaskManager/Test/test_render/spe/Load_Texture.cpp --- a/TaskManager/Test/test_render/spe/Load_Texture.cpp Sun May 31 15:55:00 2009 +0900 +++ b/TaskManager/Test/test_render/spe/Load_Texture.cpp Sun May 31 16:26:20 2009 +0900 @@ -20,11 +20,11 @@ */ void *hash_tmp = smanager->global_alloc(GLOBAL_TEXTURE_HASH, sizeof(TileHash)); - TileHashPtr hashtable = new(hash_tmp) TileHash; + new(hash_tmp) TileHash; void *tileList_tmp = smanager->global_alloc(GLOBAL_TILE_LIST, sizeof(TileList)); - TileListPtr tileList = new(tileList_tmp) TileList; + new(tileList_tmp) TileList; return 0; }