Use std::optional as suggested by Peter. Much better!

Author: bsyrowik

src/acl_usm.cpp

@@ -101,14 +101,14 @@ CL_API_ENTRY void *CL_API_CALL clHostMemAllocINTEL(
   // Iterate over properties.
   // The end of the properties list is specified with a zero.
   cl_mem_alloc_flags_intel alloc_flags = 0;
-  cl_int mem_id = -1;
+  std::optional<cl_uint> mem_id;
   while (properties != NULL && *properties != 0) {
     switch (*properties) {
     case CL_MEM_ALLOC_FLAGS_INTEL: {
       alloc_flags = *(properties + 1);
     } break;
     case CL_MEM_ALLOC_BUFFER_LOCATION_INTEL: {
-      mem_id = (cl_int) * (properties + 1);
+      mem_id = (cl_uint) * (properties + 1);
     } break;
     default: {
       UNLOCK_BAIL_INFO(CL_INVALID_PROPERTY, context, "Invalid properties");
@@ -145,9 +145,9 @@ CL_API_ENTRY void *CL_API_CALL clHostMemAllocINTEL(
 
   if (acl_get_hal()->host_alloc) {
     std::vector<mem_properties_t> mmd_properties;
-    if (mem_id >= 0) {
+    if (mem_id) {
       mmd_properties.push_back(AOCL_MMD_MEM_PROPERTIES_BUFFER_LOCATION);
-      mmd_properties.push_back(mem_id);
+      mmd_properties.push_back(mem_id.value());
     }
     mmd_properties.push_back(0);
 
@@ -394,7 +394,7 @@ clSharedMemAllocINTEL(cl_context context, cl_device_id device,
   // The end of the properties list is specified with a zero.
   cl_mem_alloc_flags_intel alloc_flags = 0;
   std::unordered_set<unsigned long long> seen_flags;
-  cl_int mem_id = -1;
+  std::optional<cl_uint> mem_id;
   while (properties != NULL && *properties != 0) {
     switch (*properties) {
     case CL_MEM_ALLOC_FLAGS_INTEL: {
@@ -417,7 +417,7 @@ clSharedMemAllocINTEL(cl_context context, cl_device_id device,
         UNLOCK_BAIL_INFO(CL_INVALID_PROPERTY, context,
                          "Property specified multiple times");
       }
-      mem_id = (cl_int) * (properties + 1);
+      mem_id = (cl_uint) * (properties + 1);
     } break;
     default: {
       UNLOCK_BAIL_INFO(CL_INVALID_PROPERTY, context, "Invalid properties");
@@ -428,9 +428,9 @@ clSharedMemAllocINTEL(cl_context context, cl_device_id device,
 
   if (acl_get_hal()->shared_alloc) {
     std::vector<mem_properties_t> mmd_properties;
-    if (mem_id >= 0) {
+    if (mem_id) {
       mmd_properties.push_back(AOCL_MMD_MEM_PROPERTIES_BUFFER_LOCATION);
-      mmd_properties.push_back(mem_id);
+      mmd_properties.push_back(mem_id.value());
     }
     mmd_properties.push_back(0);