Mercurial > hg > Game > Cerium
changeset 1940:0f6d0ae5c3f3 draft
change manager->allocate size long long to long
| author | Masataka Kohagura <e085726@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Mon, 03 Feb 2014 22:54:40 +0900 |
| parents | d862c573bf84 |
| children | b5d778f00bf1 |
| files | TaskManager/kernel/ppe/TaskManager.cc TaskManager/kernel/ppe/TaskManager.h TaskManager/kernel/ppe/TaskManagerImpl.h example/regex_mas/main.cc |
| diffstat | 4 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/kernel/ppe/TaskManager.cc Mon Feb 03 22:48:36 2014 +0900 +++ b/TaskManager/kernel/ppe/TaskManager.cc Mon Feb 03 22:54:40 2014 +0900 @@ -77,7 +77,7 @@ } void* -TaskManager::allocate(long long size) { +TaskManager::allocate(long size) { return m_impl->allocate(size); }
--- a/TaskManager/kernel/ppe/TaskManager.h Mon Feb 03 22:48:36 2014 +0900 +++ b/TaskManager/kernel/ppe/TaskManager.h Mon Feb 03 22:54:40 2014 +0900 @@ -24,7 +24,7 @@ HTaskPtr create_task_array(int id, int num_task, int num_param, int num_inData, int num_outData); void run(); - void *allocate(long long size); + void *allocate(long size); void set_TMend(void (*endf)(TaskManager *manager)); int get_cpuNum(); int get_random();
--- a/TaskManager/kernel/ppe/TaskManagerImpl.h Mon Feb 03 22:48:36 2014 +0900 +++ b/TaskManager/kernel/ppe/TaskManagerImpl.h Mon Feb 03 22:54:40 2014 +0900 @@ -81,7 +81,7 @@ #endif } - void* allocate(long long size, int alignment) + void* allocate(long size, int alignment) { void *buff = 0; @@ -96,7 +96,7 @@ return buff; } - void* allocate(long long size) + void* allocate(long size) { void *buff = 0;
--- a/example/regex_mas/main.cc Mon Feb 03 22:48:36 2014 +0900 +++ b/example/regex_mas/main.cc Mon Feb 03 22:54:40 2014 +0900 @@ -283,7 +283,7 @@ w->read_task_num += ((w->read_filesize % READ_DIVISION_SIZE) != 0); printf("filesize : %lld\n",w->read_filesize); - printf("one_task_size: %d\n",w->read_division_size); + printf("one_task_size: %ld\n",w->read_division_size); printf("task_num : %d\n",w->read_task_num); HTaskPtr r_run = NULL;