diff --git a/src/modules/thread/sdl/Thread.cpp b/src/modules/thread/sdl/Thread.cpp index 219adc4dd..9601ba9fb 100644 --- a/src/modules/thread/sdl/Thread.cpp +++ b/src/modules/thread/sdl/Thread.cpp @@ -249,7 +249,7 @@ namespace sdl return name; } - ThreadVariant *Thread::receive(const std::string & name) + ThreadVariant *Thread::get(const std::string & name) { lock(); ThreadVariant *v = comm->getValue(name); @@ -282,7 +282,7 @@ namespace sdl unlock(); } - void Thread::send(const std::string & name, ThreadVariant *v) + void Thread::set(const std::string & name, ThreadVariant *v) { lock(); comm->setValue(name, v); diff --git a/src/modules/thread/sdl/Thread.h b/src/modules/thread/sdl/Thread.h index b7240b103..58ca4c599 100644 --- a/src/modules/thread/sdl/Thread.h +++ b/src/modules/thread/sdl/Thread.h @@ -115,10 +115,10 @@ namespace sdl void kill(); void wait(); std::string getName(); - ThreadVariant *receive(const std::string & name); + ThreadVariant *get(const std::string & name); ThreadVariant *demand(const std::string & name); void clear(const std::string & name); - void send(const std::string & name, ThreadVariant *v); + void set(const std::string & name, ThreadVariant *v); void lock(); void unlock(); }; // Thread diff --git a/src/modules/thread/sdl/wrap_Thread.cpp b/src/modules/thread/sdl/wrap_Thread.cpp index dd6dcc88f..5db4bd3ad 100644 --- a/src/modules/thread/sdl/wrap_Thread.cpp +++ b/src/modules/thread/sdl/wrap_Thread.cpp @@ -72,11 +72,11 @@ namespace sdl return 1; } - int w_Thread_receive(lua_State *L) + int w_Thread_get(lua_State *L) { Thread *t = luax_checkthread(L, 1); std::string name = luax_checklstring(L, 2); - ThreadVariant *v = t->receive(name); + ThreadVariant *v = t->get(name); if (!v) { lua_pushnil(L); @@ -162,7 +162,7 @@ namespace sdl { Thread *t = luax_checkthread(L, 1); std::string name = luax_checklstring(L, 2); - ThreadVariant *v = t->receive(name); + ThreadVariant *v = t->get(name); if (!v) { lua_pushnil(L); @@ -216,7 +216,7 @@ namespace sdl return t; } - int w_Thread_send(lua_State *L) + int w_Thread_set(lua_State *L) { Thread *t = luax_checkthread(L, 1); std::string name = luax_checklstring(L, 2); @@ -247,7 +247,7 @@ namespace sdl { return luaL_error(L, "Expected boolean, number, string or userdata"); } - t->send(name, v); + t->set(name, v); v->release(); return 0; } @@ -257,10 +257,10 @@ namespace sdl { "kill", w_Thread_kill }, { "wait", w_Thread_wait }, { "getName", w_Thread_getName }, - { "receive", w_Thread_receive }, + { "get", w_Thread_get }, { "demand", w_Thread_demand }, { "peek", w_Thread_peek }, - { "send", w_Thread_send }, + { "set", w_Thread_set }, { 0, 0 } }; diff --git a/src/modules/thread/sdl/wrap_Thread.h b/src/modules/thread/sdl/wrap_Thread.h index c8e1d0d74..d5ab55212 100644 --- a/src/modules/thread/sdl/wrap_Thread.h +++ b/src/modules/thread/sdl/wrap_Thread.h @@ -37,10 +37,10 @@ namespace sdl int w_Thread_kill(lua_State *L); int w_Thread_wait(lua_State *L); int w_Thread_getName(lua_State *L); - int w_Thread_receive(lua_State *L); + int w_Thread_get(lua_State *L); int w_Thread_demand(lua_State *L); int w_Thread_peek(lua_State *L); - int w_Thread_send(lua_State *L); + int w_Thread_set(lua_State *L); int luaopen_thread(lua_State *L);