Mercurial > hg > Game > Cerium
changeset 1450:27ed99a7a48c draft
change to const char* for char*
| author | Daichi TOMA <toma@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 24 Apr 2012 18:07:27 +0900 |
| parents | a193b282952b |
| children | 7ab643c30a71 |
| files | TaskManager/Gpu/GpuScheduler.cc TaskManager/Makefile.gpu TaskManager/test/GpuRegistTaskTest/GpuRegistTaskTest.cc TaskManager/test/GpuRegistTaskTest/Makefile |
| diffstat | 4 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Gpu/GpuScheduler.cc Tue Apr 24 14:20:09 2012 +0900 +++ b/TaskManager/Gpu/GpuScheduler.cc Tue Apr 24 18:07:27 2012 +0900 @@ -53,7 +53,7 @@ void -gpu_register_task(int cmd, char* filename, char* functionname) +gpu_register_task(int cmd, const char* filename, const char* functionname) { GpuThreads* gputhreads = GpuThreads::getInstance(); cl_context& context = gputhreads->context;
--- a/TaskManager/Makefile.gpu Tue Apr 24 14:20:09 2012 +0900 +++ b/TaskManager/Makefile.gpu Tue Apr 24 18:07:27 2012 +0900 @@ -6,7 +6,6 @@ CFLAGS += -lrt endif - .SUFFIXES: .cc .o EXTRA_CFLAGS = -D__CERIUM_GPU__
--- a/TaskManager/test/GpuRegistTaskTest/GpuRegistTaskTest.cc Tue Apr 24 14:20:09 2012 +0900 +++ b/TaskManager/test/GpuRegistTaskTest/GpuRegistTaskTest.cc Tue Apr 24 18:07:27 2012 +0900 @@ -5,6 +5,8 @@ #include "CellTaskManagerImpl.h" #define DEFAULT 5 + +extern void gpu_register_task(int, const char*, const char*); void print_data(int *data, int size, const char *title) { @@ -42,7 +44,7 @@ } printf("%d",count); - GpuSchedRegister(1, "twice.cl","Twice"); + GpuSchedRegister(1, "twice.cl", "Twice"); cl_int ret; cl_context context = gpuThreads->context;
--- a/TaskManager/test/GpuRegistTaskTest/Makefile Tue Apr 24 14:20:09 2012 +0900 +++ b/TaskManager/test/GpuRegistTaskTest/Makefile Tue Apr 24 18:07:27 2012 +0900 @@ -2,11 +2,11 @@ CPPFLAGS += -g -Wall -I../../../include/TaskManager -m$(ABIBIT) -TARGET= GpuRegistTaskTest +TARGET=GpuRegistTaskTest $(TARGET) : -LIBS += ../../libFifoManager.a +LIBS += ../../libGpuManager.a CpuThreadsTest : GpuRegistTaskTest.o $(CC) $(CFLAGS) -o $@ $? $(LIBS)