diff --git a/libsyclinterface/source/dpctl_sycl_queue_interface.cpp b/libsyclinterface/source/dpctl_sycl_queue_interface.cpp index 387374a032..ce318ce37e 100644 --- a/libsyclinterface/source/dpctl_sycl_queue_interface.cpp +++ b/libsyclinterface/source/dpctl_sycl_queue_interface.cpp @@ -143,6 +143,9 @@ std::unique_ptr create_property_list(int properties) propList = std::make_unique(sycl::property::queue::in_order()); } + else { + propList = std::make_unique(); + } if (_prop) { std::stringstream ss; @@ -185,7 +188,7 @@ DPCTLQueue_Create(__dpctl_keep const DPCTLSyclContextRef CRef, } auto propList = create_property_list(properties); - if (propList && handler) { + if (handler) { try { auto Queue = new queue(*ctx, *dev, DPCTL_AsyncErrorHandler(handler), *propList); @@ -194,26 +197,9 @@ DPCTLQueue_Create(__dpctl_keep const DPCTLSyclContextRef CRef, error_handler(e, __FILE__, __func__, __LINE__); } } - else if (properties) { - try { - auto Queue = new queue(*ctx, *dev, *propList); - q = wrap(Queue); - } catch (std::exception const &e) { - error_handler(e, __FILE__, __func__, __LINE__); - } - } - else if (handler) { - try { - auto Queue = - new queue(*ctx, *dev, DPCTL_AsyncErrorHandler(handler)); - q = wrap(Queue); - } catch (std::exception const &e) { - error_handler(e, __FILE__, __func__, __LINE__); - } - } else { try { - auto Queue = new queue(*ctx, *dev); + auto Queue = new queue(*ctx, *dev, *propList); q = wrap(Queue); } catch (std::exception const &e) { error_handler(e, __FILE__, __func__, __LINE__);