further msvc fixes

boostorg · Nov 27, 2023 · a8aeb48 · a8aeb48
1 parent cff6a87
commit a8aeb48
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/test/integration/test/handshake.cpp b/test/integration/test/handshake.cpp
@@ -186,9 +186,9 @@ struct caching_sha2_fixture : handshake_fixture
 {
     void load_sha256_cache(string_view user, string_view password)
     {
-        tcp_ssl_connection conn(ctx, ssl_ctx);
-        conn.connect(get_endpoint<tcp_socket>(), handshake_params(user, password));
-        conn.close();
+        tcp_ssl_connection root_conn(ctx, ssl_ctx);
+        root_conn.connect(get_endpoint<tcp_socket>(), handshake_params(user, password));
+        root_conn.close();
     }
 
     void clear_sha256_cache()

diff --git a/test/integration/test/spotchecks.cpp b/test/integration/test/spotchecks.cpp
@@ -179,8 +179,8 @@ BOOST_MYSQL_NETWORK_TEST(start_statement_execution_legacy_it_success, network_fi
 
     // Execute
     execution_state st;
-    std::forward_list<field_view> params{field_view("item"), field_view(42)};
-    conn->start_statement_execution(stmt, params.begin(), params.end(), st).validate_no_error();
+    std::forward_list<field_view> stmt_params{field_view("item"), field_view(42)};
+    conn->start_statement_execution(stmt, stmt_params.begin(), stmt_params.end(), st).validate_no_error();
     validate_2fields_meta(st.meta(), "empty_table");
     BOOST_TEST(st.should_read_rows());
 }

diff --git a/test/unit/test/execution_processor/static_execution_state_impl.cpp b/test/unit/test/execution_processor/static_execution_state_impl.cpp
@@ -667,7 +667,7 @@ BOOST_AUTO_TEST_CASE(tuples)
         fields
     );
     throw_on_error(err);
-    BOOST_TEST((storage_1[0] == row1_tuple{10u, "abc"}));
+    BOOST_TEST((storage_1[0] == row1_tuple{std::uint16_t(10), "abc"}));
 
     // EOF r1
     add_ok(st, create_ok_r1(true));
@@ -689,7 +689,7 @@ BOOST_AUTO_TEST_CASE(tuples)
         fields
     );
     throw_on_error(err);
-    BOOST_TEST((storage_3[0] == row3_tuple{4.2f, 90.0, 9}));
+    BOOST_TEST((storage_3[0] == row3_tuple{4.2f, 90.0, std::uint8_t(9)}));
 
     // OK r3
     add_ok(st, create_ok_r3());

diff --git a/test/unit/test/execution_processor/static_results_impl.cpp b/test/unit/test/execution_processor/static_results_impl.cpp
@@ -738,10 +738,10 @@ BOOST_AUTO_TEST_CASE(tuples)
 
     // Verify
     std::vector<row1_tuple> expected_r1{
-        row1_tuple{10u, "abc"}
+        row1_tuple{std::uint16_t(10), "abc"}
     };
     std::vector<row3_tuple> expected_r3{
-        row3_tuple{4.2f, 90.0, 9u}
+        row3_tuple{4.2f, 90.0, std::uint8_t(9)}
     };
     BOOST_TEST(st.is_complete());
     check_meta_r1(st.get_meta(0));