Commit a1ba3c1c authored by Marian Triebe's avatar Marian Triebe

Update header guards and namespace to match libcaf

parent 3c8b2c3b
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_ACTOR_FACADE_HPP #ifndef CAF_OPENCL_ACTOR_FACADE_HPP
#define CPPA_OPENCL_ACTOR_FACADE_HPP #define CAF_OPENCL_ACTOR_FACADE_HPP
#include <ostream> #include <ostream>
#include <iostream> #include <iostream>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include "cppa/opencl/program.hpp" #include "cppa/opencl/program.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "cppa/opencl/smart_ptr.hpp"
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
class opencl_metainfo; class opencl_metainfo;
...@@ -233,6 +233,6 @@ class actor_facade<Ret(Args...)> : public abstract_actor { ...@@ -233,6 +233,6 @@ class actor_facade<Ret(Args...)> : public abstract_actor {
}; };
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_ACTOR_FACADE_HPP #endif // CAF_OPENCL_ACTOR_FACADE_HPP
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_COMMAND_HPP #ifndef CAF_OPENCL_COMMAND_HPP
#define CPPA_OPENCL_COMMAND_HPP #define CAF_OPENCL_COMMAND_HPP
#include <vector> #include <vector>
#include <numeric> #include <numeric>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#include "cppa/opencl/smart_ptr.hpp" #include "cppa/opencl/smart_ptr.hpp"
#include "cppa/util/scope_guard.hpp" #include "cppa/util/scope_guard.hpp"
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
template<typename T, typename R> template<typename T, typename R>
...@@ -147,6 +147,6 @@ class command : public ref_counted { ...@@ -147,6 +147,6 @@ class command : public ref_counted {
}; };
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_COMMAND_HPP #endif // CAF_OPENCL_COMMAND_HPP
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_DEVICE_INFO_HPP #ifndef CAF_OPENCL_DEVICE_INFO_HPP
#define CPPA_OPENCL_DEVICE_INFO_HPP #define CAF_OPENCL_DEVICE_INFO_HPP
#include "cppa/opencl/global.hpp" #include "cppa/opencl/global.hpp"
#include "cppa/opencl/program.hpp" #include "cppa/opencl/program.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "cppa/opencl/smart_ptr.hpp"
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
class device_info { class device_info {
...@@ -74,7 +74,7 @@ inline dim_vec device_info::get_max_work_items_per_dim() { ...@@ -74,7 +74,7 @@ inline dim_vec device_info::get_max_work_items_per_dim() {
} }
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_DEVICE_INFO_HPP #endif // CAF_OPENCL_DEVICE_INFO_HPP
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_GLOBAL_HPP #ifndef CAF_OPENCL_GLOBAL_HPP
#define CPPA_OPENCL_GLOBAL_HPP #define CAF_OPENCL_GLOBAL_HPP
#include <string> #include <string>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <CL/opencl.h> #include <CL/opencl.h>
#endif #endif
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
/** /**
...@@ -44,6 +44,6 @@ cl_int clReleaseDeviceDummy (cl_device_id); ...@@ -44,6 +44,6 @@ cl_int clReleaseDeviceDummy (cl_device_id);
cl_int clRetainDeviceDummy (cl_device_id); cl_int clRetainDeviceDummy (cl_device_id);
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_GLOBAL_HPP #endif // CAF_OPENCL_GLOBAL_HPP
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_METAINFO_HPP #ifndef CAF_OPENCL_METAINFO_HPP
#define CPPA_OPENCL_METAINFO_HPP #define CAF_OPENCL_METAINFO_HPP
#include <atomic> #include <atomic>
#include <vector> #include <vector>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include "cppa/detail/singleton_mixin.hpp" #include "cppa/detail/singleton_mixin.hpp"
#include "cppa/detail/singleton_manager.hpp" #include "cppa/detail/singleton_manager.hpp"
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
class opencl_metainfo { class opencl_metainfo {
...@@ -67,6 +67,6 @@ class opencl_metainfo { ...@@ -67,6 +67,6 @@ class opencl_metainfo {
opencl_metainfo* get_opencl_metainfo(); opencl_metainfo* get_opencl_metainfo();
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_METAINFO_HPP #endif // CAF_OPENCL_METAINFO_HPP
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_PROGRAM_HPP #ifndef CAF_OPENCL_PROGRAM_HPP
#define CPPA_OPENCL_PROGRAM_HPP #define CAF_OPENCL_PROGRAM_HPP
#include <memory> #include <memory>
#include "cppa/opencl/global.hpp" #include "cppa/opencl/global.hpp"
#include "cppa/opencl/smart_ptr.hpp" #include "cppa/opencl/smart_ptr.hpp"
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
template<typename Signature> template<typename Signature>
...@@ -59,6 +59,6 @@ class program { ...@@ -59,6 +59,6 @@ class program {
}; };
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_PROGRAM_HPP #endif // CAF_OPENCL_PROGRAM_HPP
...@@ -17,14 +17,14 @@ ...@@ -17,14 +17,14 @@
* http://www.boost.org/LICENSE_1_0.txt. * * http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/ ******************************************************************************/
#ifndef CPPA_OPENCL_SMART_PTR_HPP #ifndef CAF_OPENCL_SMART_PTR_HPP
#define CPPA_OPENCL_SMART_PTR_HPP #define CAF_OPENCL_SMART_PTR_HPP
#include <memory> #include <memory>
#include <algorithm> #include <algorithm>
#include <type_traits> #include <type_traits>
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
template<typename T, cl_int (*ref)(T), cl_int (*deref)(T)> template<typename T, cl_int (*ref)(T), cl_int (*deref)(T)>
...@@ -109,6 +109,6 @@ typedef smart_ptr<cl_command_queue, clRetainCommandQueue, clReleaseCommandQueue> ...@@ -109,6 +109,6 @@ typedef smart_ptr<cl_command_queue, clRetainCommandQueue, clReleaseCommandQueue>
command_queue_ptr; command_queue_ptr;
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
#endif // CPPA_OPENCL_SMART_PTR_HPP #endif // CAF_OPENCL_SMART_PTR_HPP
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "cppa/opencl/global.hpp" #include "cppa/opencl/global.hpp"
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
std::string get_opencl_error(cl_int err) { std::string get_opencl_error(cl_int err) {
...@@ -126,5 +126,5 @@ cl_int clReleaseDeviceDummy (cl_device_id) { return 0; } ...@@ -126,5 +126,5 @@ cl_int clReleaseDeviceDummy (cl_device_id) { return 0; }
cl_int clRetainDeviceDummy (cl_device_id) { return 0; } cl_int clRetainDeviceDummy (cl_device_id) { return 0; }
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
using namespace std; using namespace std;
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
const std::vector<device_info> opencl_metainfo::get_devices() const { const std::vector<device_info> opencl_metainfo::get_devices() const {
...@@ -205,6 +205,6 @@ opencl_metainfo* get_opencl_metainfo() { ...@@ -205,6 +205,6 @@ opencl_metainfo* get_opencl_metainfo() {
} }
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
using namespace std; using namespace std;
namespace cppa { namespace caf {
namespace opencl { namespace opencl {
...@@ -109,5 +109,5 @@ program program::create(const char* kernel_source, const char* options, uint32_t ...@@ -109,5 +109,5 @@ program program::create(const char* kernel_source, const char* options, uint32_t
} }
} // namespace opencl } // namespace opencl
} // namespace cppa } // namespace caf
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