moved Semaphore to khr namespace

Author: Bogumil-Sapinski-Mobica

include/CL/opencl.hpp

@@ -729,7 +729,9 @@ namespace cl {
     class Buffer;
     class Pipe;
 #ifdef cl_khr_semaphore
+namespace khr{
     class Semaphore;
+}
 #endif
 #if defined(cl_khr_command_buffer)
     namespace khr {
@@ -9178,13 +9180,13 @@ typedef CL_API_ENTRY cl_int (CL_API_CALL *PFN_clEnqueueReleaseD3D10ObjectsKHR)(
 
 #ifdef cl_khr_semaphore
     cl_int enqueueWaitSemaphores(
-        const vector<Semaphore> &sema_objects,
+        const vector<khr::Semaphore> &sema_objects,
         const vector<cl_semaphore_payload_khr> &sema_payloads = {},
         const vector<Event>* events_wait_list = nullptr,
         Event *event = nullptr) const;
 
     cl_int enqueueSignalSemaphores(
-        const vector<Semaphore> &sema_objects,
+        const vector<khr::Semaphore> &sema_objects,
         const vector<cl_semaphore_payload_khr>& sema_payloads = {},
         const vector<Event>* events_wait_list = nullptr,
         Event* event = nullptr);
@@ -10775,6 +10777,7 @@ enum ExternalSemaphoreType : cl_external_semaphore_handle_type_khr
 };
 #endif // cl_khr_external_semaphore
 
+namespace khr {
 class Semaphore : public detail::Wrapper<cl_semaphore_khr>
 {
 public:
@@ -10931,11 +10934,12 @@ class Semaphore : public detail::Wrapper<cl_semaphore_khr>
     }
 
 };
+} // namespace khr
 
-CL_HPP_DEFINE_STATIC_MEMBER_ std::once_flag Semaphore::ext_init_;
+CL_HPP_DEFINE_STATIC_MEMBER_ std::once_flag khr::Semaphore::ext_init_;
 
 inline cl_int CommandQueue::enqueueWaitSemaphores(
-    const vector<Semaphore> &sema_objects,
+    const vector<khr::Semaphore> &sema_objects,
     const vector<cl_semaphore_payload_khr> &sema_payloads,
     const vector<Event>* events_wait_list,
     Event *event) const
@@ -10963,7 +10967,7 @@ inline cl_int CommandQueue::enqueueWaitSemaphores(
 }
 
 inline cl_int CommandQueue::enqueueSignalSemaphores(
-    const vector<Semaphore> &sema_objects,
+    const vector<khr::Semaphore> &sema_objects,
     const vector<cl_semaphore_payload_khr>& sema_payloads,
     const vector<Event>* events_wait_list,
     Event* event)

tests/test_openclhpp.cpp

@@ -86,7 +86,7 @@ static cl::Program programPool[POOL_MAX];
 static cl::khr::CommandBuffer commandBufferKhrPool[POOL_MAX];
 #endif
 #if defined(cl_khr_semaphore)
-static cl::Semaphore semaphorePool[POOL_MAX];
+static cl::khr::Semaphore semaphorePool[POOL_MAX];
 #endif
 static cl::Device devicePool[POOL_MAX];
 
@@ -3633,15 +3633,17 @@ void testDevice_GetInfo_CLDeviceName()
 } 
 
 /****************************************************************************
- * Tests for cl::Semaphore
+ * Tests for cl::khr::Semaphore
  ****************************************************************************/
 #if defined(cl_khr_semaphore)
 void testMoveAssignSemaphoreNonNull(void);
 void testMoveAssignSemaphoreNull(void);
 void testMoveConstructSemaphoreNonNull(void);
 void testMoveConstructSemaphoreNull(void);
 namespace cl{
-MAKE_MOVE_TESTS(Semaphore, make_semaphore_khr, clReleaseSemaphoreKHR, semaphorePool);
+    namespace khr{
+    MAKE_MOVE_TESTS(Semaphore, make_semaphore_khr, clReleaseSemaphoreKHR, semaphorePool);
+    }
 }
 #else
 void testMoveAssignSemaphoreNonNull(void) {}
@@ -3682,7 +3684,7 @@ void testEnqueueWaitSemaphores(void)
 {
     clEnqueueWaitSemaphoresKHR_StubWithCallback(clEnqueueWaitSemaphoresKHR_testEnqueueWaitSemaphores);
 
-    VECTOR_CLASS<cl::Semaphore> sema_objects;
+    VECTOR_CLASS<cl::khr::Semaphore> sema_objects;
     sema_objects.emplace_back(make_semaphore_khr(1));
     VECTOR_CLASS<cl_semaphore_payload_khr> sema_payloads(1);
     cl::Event event;
@@ -3727,7 +3729,7 @@ void testEnqueueSignalSemaphores(void)
 {
     clEnqueueSignalSemaphoresKHR_StubWithCallback(clEnqueueSignalSemaphoresKHR_testEnqueueSignalSemaphores);
 
-    VECTOR_CLASS<cl::Semaphore> sema_objects;
+    VECTOR_CLASS<cl::khr::Semaphore> sema_objects;
     sema_objects.emplace_back(make_semaphore_khr(2));
     VECTOR_CLASS<cl_semaphore_payload_khr> sema_payloads(1);
     cl::Event event;
@@ -3770,7 +3772,7 @@ void testSemaphoreWithProperties(void)
 
     VECTOR_CLASS<cl_semaphore_properties_khr> sema_props{CL_SEMAPHORE_TYPE_KHR};
     cl_int err = CL_INVALID_OPERATION;
-    cl::Semaphore sem(contextPool[0], sema_props, &err);
+    cl::khr::Semaphore sem(contextPool[0], sema_props, &err);
 
     TEST_ASSERT_EQUAL(CL_SUCCESS, err);
     TEST_ASSERT_EQUAL_PTR(make_semaphore_khr(1), sem());
@@ -4118,7 +4120,7 @@ void testTemplateGetSemaphoreHandleForTypeKHR()
 
     clGetSemaphoreHandleForTypeKHR_StubWithCallback(clGetSemaphoreHandleForTypeKHR_GetHandles);
 
-    cl::Semaphore semaphore;
+    cl::khr::Semaphore semaphore;
 #if defined(cl_khr_external_semaphore_dx_fence)
     {
         auto handle0 = semaphore.getHandleForTypeKHR<cl::ExternalSemaphoreType::D3D12Fence>(device);