Commit f2a33b6a authored by Marian Triebe's avatar Marian Triebe

Change include paths to match with libcaf

parent 6a73d53c
...@@ -25,21 +25,21 @@ ...@@ -25,21 +25,21 @@
#include <algorithm> #include <algorithm>
#include <stdexcept> #include <stdexcept>
#include "cppa/cppa.hpp" #include "caf/all.hpp"
#include "cppa/channel.hpp" #include "caf/channel.hpp"
#include "cppa/to_string.hpp" #include "caf/to_string.hpp"
#include "cppa/tuple_cast.hpp" #include "caf/tuple_cast.hpp"
#include "cppa/intrusive_ptr.hpp" #include "caf/intrusive_ptr.hpp"
#include "cppa/util/int_list.hpp" #include "caf/detail/int_list.hpp"
#include "cppa/util/type_list.hpp" #include "caf/detail/type_list.hpp"
#include "cppa/util/limited_vector.hpp" #include "caf/detail/limited_vector.hpp"
#include "cppa/opencl/global.hpp" #include "caf/opencl/global.hpp"
#include "cppa/opencl/command.hpp" #include "caf/opencl/command.hpp"
#include "cppa/opencl/program.hpp" #include "caf/opencl/program.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "caf/opencl/smart_ptr.hpp"
namespace caf { namespace caf {
namespace opencl { namespace opencl {
...@@ -56,7 +56,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -56,7 +56,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
public: public:
typedef cow_tuple<typename util::rm_const_and_ref<Args>::type...> typedef cow_tuple<typename detail::rm_const_and_ref<Args>::type...>
args_tuple; args_tuple;
typedef std::function<optional<args_tuple>(any_tuple)> arg_mapping; typedef std::function<optional<args_tuple>(any_tuple)> arg_mapping;
...@@ -109,7 +109,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -109,7 +109,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
void enqueue(msg_hdr_cref hdr, any_tuple msg, execution_unit*) override { void enqueue(msg_hdr_cref hdr, any_tuple msg, execution_unit*) override {
CPPA_LOG_TRACE(""); CPPA_LOG_TRACE("");
typename util::il_indices<util::type_list<Args...>>::type indices; typename detail::il_indices<detail::type_list<Args...>>::type indices;
enqueue_impl(hdr.sender, std::move(msg), hdr.id, indices); enqueue_impl(hdr.sender, std::move(msg), hdr.id, indices);
} }
...@@ -138,7 +138,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -138,7 +138,7 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
template <long... Is> template <long... Is>
void enqueue_impl(const actor_addr& sender, any_tuple msg, message_id id, void enqueue_impl(const actor_addr& sender, any_tuple msg, message_id id,
util::int_list<Is...>) { detail::int_list<Is...>) {
auto opt = m_map_args(std::move(msg)); auto opt = m_map_args(std::move(msg));
if (opt) { if (opt) {
response_promise handle{this->address(), sender, id.response_id()}; response_promise handle{this->address(), sender, id.response_id()};
......
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include "cppa/logging.hpp" #include "caf/logging.hpp"
#include "cppa/opencl/global.hpp" #include "caf/opencl/global.hpp"
#include "cppa/abstract_actor.hpp" #include "caf/abstract_actor.hpp"
#include "cppa/response_promise.hpp" #include "caf/response_promise.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "caf/opencl/smart_ptr.hpp"
#include "cppa/util/scope_guard.hpp" #include "caf/detail/scope_guard.hpp"
namespace caf { namespace caf {
namespace opencl { namespace opencl {
......
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
#ifndef CAF_OPENCL_DEVICE_INFO_HPP #ifndef CAF_OPENCL_DEVICE_INFO_HPP
#define CAF_OPENCL_DEVICE_INFO_HPP #define CAF_OPENCL_DEVICE_INFO_HPP
#include "cppa/opencl/global.hpp" #include "caf/opencl/global.hpp"
#include "cppa/opencl/program.hpp" #include "caf/opencl/program.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "caf/opencl/smart_ptr.hpp"
namespace caf { namespace caf {
namespace opencl { namespace opencl {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <string> #include <string>
#include "cppa/util/limited_vector.hpp" #include "caf/detail/limited_vector.hpp"
#if defined __APPLE__ || defined(MACOSX) #if defined __APPLE__ || defined(MACOSX)
#include <OpenCL/opencl.h> #include <OpenCL/opencl.h>
...@@ -36,7 +36,7 @@ namespace opencl { ...@@ -36,7 +36,7 @@ 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 detail::limited_vector<size_t, 3> dim_vec;
std::string get_opencl_error(cl_int err); std::string get_opencl_error(cl_int err);
......
...@@ -25,16 +25,16 @@ ...@@ -25,16 +25,16 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include "cppa/cppa.hpp" #include "caf/all.hpp"
#include "cppa/opencl/global.hpp" #include "caf/opencl/global.hpp"
#include "cppa/opencl/program.hpp" #include "caf/opencl/program.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "caf/opencl/smart_ptr.hpp"
#include "cppa/opencl/device_info.hpp" #include "caf/opencl/device_info.hpp"
#include "cppa/opencl/actor_facade.hpp" #include "caf/opencl/actor_facade.hpp"
#include "cppa/detail/singleton_mixin.hpp" #include "caf/detail/singleton_mixin.hpp"
#include "cppa/detail/singleton_manager.hpp" #include "caf/detail/singleton_manager.hpp"
namespace caf { namespace caf {
namespace opencl { namespace opencl {
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <memory> #include <memory>
#include "cppa/opencl/global.hpp" #include "caf/opencl/global.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "caf/opencl/smart_ptr.hpp"
namespace caf { namespace caf {
namespace opencl { namespace opencl {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#include "cppa/opencl/global.hpp" #include "caf/opencl/global.hpp"
namespace caf { namespace caf {
namespace opencl { namespace opencl {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#include "cppa/opencl/opencl_metainfo.hpp" #include "caf/opencl/opencl_metainfo.hpp"
using namespace std; using namespace std;
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <cstring> #include <cstring>
#include <iostream> #include <iostream>
#include "cppa/singletons.hpp" #include "caf/singletons.hpp"
#include "cppa/opencl/program.hpp" #include "caf/opencl/program.hpp"
#include "cppa/opencl/opencl_metainfo.hpp" #include "caf/opencl/opencl_metainfo.hpp"
using namespace std; using namespace std;
......
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