Commit 7a054ed3 authored by Dominik Charousset's avatar Dominik Charousset

maintenance

bundled all type trait classes in header "cppa/util/type_traits.hpp" and
refactored some code pieces for clearity
parent 92781661
...@@ -68,7 +68,7 @@ class actor_facade<Ret(Args...)> : public actor { ...@@ -68,7 +68,7 @@ class actor_facade<Ret(Args...)> : public actor {
public: public:
typedef cow_tuple<typename util::rm_ref<Args>::type...> args_tuple; typedef cow_tuple<typename util::rm_const_and_ref<Args>::type...> args_tuple;
typedef std::function<option<args_tuple>(any_tuple)> arg_mapping; typedef std::function<option<args_tuple>(any_tuple)> arg_mapping;
typedef std::function<any_tuple(Ret&)> result_mapping; typedef std::function<any_tuple(Ret&)> result_mapping;
......
...@@ -89,7 +89,7 @@ class command_dispatcher { ...@@ -89,7 +89,7 @@ class command_dispatcher {
const dim_vec& global_dims, const dim_vec& global_dims,
const dim_vec& offsets, const dim_vec& offsets,
const dim_vec& local_dims, const dim_vec& local_dims,
std::function<option<cow_tuple<typename util::rm_ref<Args>::type...>>(any_tuple)> map_args, std::function<option<cow_tuple<typename util::rm_const_and_ref<Args>::type...>>(any_tuple)> map_args,
std::function<any_tuple(Ret&)> map_result) std::function<any_tuple(Ret&)> map_result)
{ {
return actor_facade<Ret (Args...)>::create(this, return actor_facade<Ret (Args...)>::create(this,
...@@ -109,14 +109,14 @@ class command_dispatcher { ...@@ -109,14 +109,14 @@ class command_dispatcher {
const dim_vec& offsets = {}, const dim_vec& offsets = {},
const dim_vec& local_dims = {}) const dim_vec& local_dims = {})
{ {
std::function<option<cow_tuple<typename util::rm_ref<Args>::type...>>(any_tuple)> std::function<option<cow_tuple<typename util::rm_const_and_ref<Args>::type...>>(any_tuple)>
map_args = [] (any_tuple msg) { map_args = [] (any_tuple msg) {
return tuple_cast<typename util::rm_ref<Args>::type...>(msg); return tuple_cast<typename util::rm_const_and_ref<Args>::type...>(msg);
}; };
std::function<any_tuple(Ret&)> map_result = [] (Ret& result) { std::function<any_tuple(Ret&)> map_result = [] (Ret& result) {
return make_any_tuple(std::move(result)); return make_any_tuple(std::move(result));
}; };
return this->spawn<Ret,Args...>(prog, return this->spawn<Ret, Args...>(prog,
kernel_name, kernel_name,
global_dims, global_dims,
offsets, offsets,
...@@ -149,7 +149,7 @@ class command_dispatcher { ...@@ -149,7 +149,7 @@ class command_dispatcher {
, max_itms_per_dim(max_itms_per_dim) { } , max_itms_per_dim(max_itms_per_dim) { }
}; };
typedef intrusive::blocking_single_reader_queue<command,dereferencer> typedef intrusive::blocking_single_reader_queue<command, dereferencer>
job_queue; job_queue;
static inline command_dispatcher* create_singleton() { static inline command_dispatcher* create_singleton() {
......
...@@ -47,7 +47,7 @@ namespace cppa { namespace opencl { ...@@ -47,7 +47,7 @@ namespace cppa { namespace opencl {
/** /**
* @brief A vector of up to three elements used for OpenCL dimensions. * @brief A vector of up to three elements used for OpenCL dimensions.
*/ */
typedef util::limited_vector<size_t,3> dim_vec; typedef util::limited_vector<size_t, 3> dim_vec;
std::string get_opencl_error(cl_int err); std::string get_opencl_error(cl_int err);
......
...@@ -109,14 +109,14 @@ class smart_ptr { ...@@ -109,14 +109,14 @@ class smart_ptr {
}; };
typedef smart_ptr<cl_mem,clRetainMemObject,clReleaseMemObject> mem_ptr; typedef smart_ptr<cl_mem, clRetainMemObject, clReleaseMemObject> mem_ptr;
typedef smart_ptr<cl_event,clRetainEvent,clReleaseEvent> event_ptr; typedef smart_ptr<cl_event, clRetainEvent, clReleaseEvent> event_ptr;
typedef smart_ptr<cl_kernel,clRetainKernel,clReleaseKernel> kernel_ptr; typedef smart_ptr<cl_kernel, clRetainKernel, clReleaseKernel> kernel_ptr;
typedef smart_ptr<cl_context,clRetainContext,clReleaseContext> context_ptr; typedef smart_ptr<cl_context, clRetainContext, clReleaseContext> context_ptr;
typedef smart_ptr<cl_program,clRetainProgram,clReleaseProgram> program_ptr; typedef smart_ptr<cl_program, clRetainProgram, clReleaseProgram> program_ptr;
typedef smart_ptr<cl_device_id,clRetainDeviceDummy,clReleaseDeviceDummy> typedef smart_ptr<cl_device_id, clRetainDeviceDummy, clReleaseDeviceDummy>
device_ptr; device_ptr;
typedef smart_ptr<cl_command_queue,clRetainCommandQueue,clReleaseCommandQueue> typedef smart_ptr<cl_command_queue, clRetainCommandQueue, clReleaseCommandQueue>
command_queue_ptr; command_queue_ptr;
} } // namespace cppa::opencl } } // namespace cppa::opencl
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment