further msvc fixes (2)

boostorg · Nov 27, 2023 · 9611c69 · 9611c69
1 parent 907c49c
commit 9611c69
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/test/integration/test/handshake.cpp b/test/integration/test/handshake.cpp
@@ -193,11 +193,11 @@ struct caching_sha2_fixture : handshake_fixture
 
     void clear_sha256_cache()
     {
-        tcp_ssl_connection conn(ctx, ssl_ctx);
+        tcp_ssl_connection root_conn(ctx, ssl_ctx);
         boost::mysql::results result;
-        conn.connect(get_endpoint<tcp_socket>(), handshake_params("root", ""));
-        conn.execute("FLUSH PRIVILEGES", result);
-        conn.close();
+        root_conn.connect(get_endpoint<tcp_socket>(), handshake_params("root", ""));
+        root_conn.execute("FLUSH PRIVILEGES", result);
+        root_conn.close();
     }
 };
 

diff --git a/test/integration/test/spotchecks.cpp b/test/integration/test/spotchecks.cpp
@@ -196,8 +196,8 @@ BOOST_MYSQL_NETWORK_TEST(start_statement_execution_legacy_it_error, network_fixt
 
     // Execute
     execution_state st;
-    std::forward_list<field_view> params{field_view("f0"), field_view("bad_date")};
-    conn->start_statement_execution(stmt, params.begin(), params.end(), st)
+    std::forward_list<field_view> stmt_params{field_view("f0"), field_view("bad_date")};
+    conn->start_statement_execution(stmt, stmt_params.begin(), stmt_params.end(), st)
         .validate_error(
             common_server_errc::er_truncated_wrong_value,
             {"field_date", "bad_date", "incorrect date value"}
@@ -214,8 +214,8 @@ BOOST_MYSQL_NETWORK_TEST(start_execution_stmt_it_success, network_fixture, all_n
 
     // Execute
     execution_state st;
-    std::forward_list<field_view> params{field_view("item"), field_view(42)};
-    conn->start_execution(stmt.bind(params.cbegin(), params.cend()), st).validate_no_error();
+    std::forward_list<field_view> stmt_params{field_view("item"), field_view(42)};
+    conn->start_execution(stmt.bind(stmt_params.cbegin(), stmt_params.cend()), st).validate_no_error();
     validate_2fields_meta(st.meta(), "empty_table");
     BOOST_TEST(st.should_read_rows());
 }
@@ -314,8 +314,8 @@ BOOST_MYSQL_NETWORK_TEST(execute_statement_iterator_success, network_fixture, er
 
     // Execute
     results result;
-    std::forward_list<field_view> params{field_view("item"), field_view(42)};
-    conn->execute(stmt.bind(params.cbegin(), params.cend()), result).validate_no_error();
+    std::forward_list<field_view> stmt_params{field_view("item"), field_view(42)};
+    conn->execute(stmt.bind(stmt_params.cbegin(), stmt_params.cend()), result).validate_no_error();
     BOOST_TEST(result.rows().size() == 0u);
 }