conflict

wangzhengquan

2020-07-28 baa6fb17d950c4f5684f5d798f90595456723418

 src/queue/include/shm_queue.h

@@ -68,8 +68,8 @@
      }
    }
    if (!found) {
      // mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
      // delete mqueue;
      mqueue = (LockFreeQueue<ELEM_T, SHM_Allocator> *)hashtable_get(hashtable, *keyItr);
      delete mqueue;
      hashtable_remove(hashtable, *keyItr);
    }
  }