Fix tests build on Windows

Author: kzhdev

CMakeLists.txt

@@ -13,4 +13,9 @@ if(UNIX AND NOT APPLE)
     target_link_libraries(slick_queue INTERFACE rt)
 endif()
 
-add_subdirectory(tests EXCLUDE_FROM_ALL)
+if (WIN32)
+    add_subdirectory(tests)
+else()
+    add_subdirectory(tests EXCLUDE_FROM_ALL)
+endif()
+

include/slick_queue.h

@@ -194,10 +194,14 @@ class SlickQueue {
 
 #if defined(_MSC_VER)
     void allocate_shm_data(const char* const shm_name, bool open_only) {
-        SIZE_T BF_SZ = 64 + sizeof(slot) * size_ + sizeof(T) * size_;
+        DWORD BF_SZ = 64 + sizeof(slot) * size_ + sizeof(T) * size_;
         hMapFile_ = NULL;
         if (open_only) {
+#ifndef UNICODE
+            hMapFile_ = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, (LPCSTR)shm_name);
+#else
             hMapFile_ = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, (LPCWSTR)shm_name);
+#endif
             own_ = false;
             auto err = GetLastError();
             if (hMapFile_ == NULL) {
@@ -220,8 +224,12 @@ class SlickQueue {
                 NULL,                               // default security
                 PAGE_READWRITE,                     // read/write access
                 0,                                  // maximum object size (high-order DWORD)
-                BF_SZ,                              // maximum object size (low-order DWORD)
+                BF_SZ,                       // maximum object size (low-order DWORD)
+#ifndef UNICODE
+                (LPCSTR)shm_name                    // name of mapping object
+#else           
                 (LPCWSTR)shm_name                   // name of mapping object
+#endif
             );
 
             own_ = false;

tests/CMakeLists.txt

@@ -1,7 +1,3 @@
-project(slick_queue_tests LANGUAGES CXX)
-
-set(CMAKE_CXX_STANDARD 17)
-
 add_executable(slick_queue_tests tests.cpp shm_tests.cpp)
 
 target_link_libraries(slick_queue_tests PRIVATE slick_queue)

tests/shm_tests.cpp

@@ -71,16 +71,3 @@ TEST_CASE( "Publish and read multiple - shm" ) {
   REQUIRE(read_cursor == 3);
   REQUIRE(*read.first == 23);
 }
-
-TEST_CASE("SHM test - shm") {
-    SlickQueue<int> queue(2, "sq_shm_test");
-    uint64_t read_cursor = 0;
-    auto reserved = queue.reserve();
-    *queue[reserved] = 5;
-    queue.publish(reserved);
-    auto read = queue.read(read_cursor);
-    REQUIRE(read.first != nullptr);
-    REQUIRE(read_cursor == 1);
-    REQUIRE(*read.first == 5);
-}
-