fix CI in Windows

acking-you · Nov 30, 2023 · 085b8f3 · 085b8f3
1 parent 88d1490
commit 085b8f3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/dependencies/elog4cpp/fetch_elog4cpp.cmake b/dependencies/elog4cpp/fetch_elog4cpp.cmake
@@ -1,6 +1,6 @@
 CPMAddPackage(
         NAME elog4cpp
         GIT_REPOSITORY https://gitee.com/acking-you/elog4cpp.git
-        GIT_TAG origin/fetch
+        GIT_TAG origin/master
         GIT_SHALLOW TRUE
 )
diff --git a/netpoll/net/tcp_connection.h b/netpoll/net/tcp_connection.h
@@ -163,7 +163,7 @@ class TcpConnection
     */
    bool hasContext() const
    {
-#if __cplusplus >= 201703L
+#if __cplusplus >= 201703L || (_MSC_VER && _MSVC_LANG >= 201703L)
       return m_context.has_value();
 #else
       return m_context.empty();
@@ -176,7 +176,7 @@ class TcpConnection
     */
    void clearContext()
    {
-#if __cplusplus >= 201703L
+#if __cplusplus >= 201703L || (_MSC_VER && _MSVC_LANG >= 201703L)
       m_context.reset();
 #else
       m_context.clear();

diff --git a/netpoll/util/string_view.h b/netpoll/util/string_view.h
@@ -1,6 +1,5 @@
 #pragma once
 
-// 若cpp版本为17以上则直接使用标准库的string_view，否则使用第三方库的
 #if __cplusplus >= 201703L || (_MSC_VER && _MSVC_LANG >= 201703L)
 #include <string_view>
 namespace netpoll {

diff --git a/tests/encode_util_test.cc b/tests/encode_util_test.cc
@@ -4,7 +4,6 @@
 #include <string>
 
 TEST_SUITE_BEGIN("encode_util");
-TEST_CASE("In Unix") { CHECK_EQ(1, 1); }
 #ifdef _WIN32
 using namespace netpoll;
 TEST_CASE("test fromUtf8&toUtf8")
@@ -32,5 +31,7 @@ TEST_CASE("test fromNativePath&toNativePath")
       CHECK_EQ(windowsNativePath, netpoll::utils::toNativePath(windowsNetPath));
    }
 }
+#else
+TEST_CASE("In Unix") { CHECK_EQ(1, 1); }
 #endif
 TEST_SUITE_END;
diff --git a/tests/message_buffer_test.cc b/tests/message_buffer_test.cc
@@ -1,5 +1,6 @@
 #include <doctest/doctest.h>
 #include <netpoll/util/message_buffer.h>
+#include <iostream>
 using namespace netpoll;
 
 TEST_CASE("test MessageBuffer")