From 48a54ee9e8b23bf03eb697b7b9d8ad1840a6ef77 Mon Sep 17 00:00:00 2001
From: Ashley Coleman <ascoleman@microsoft.com>
Date: Thu, 9 Apr 2026 13:43:10 -0600
Subject: [PATCH 1/2] [SM6.10][HLK] Remove using std from common header

---
 include/dxc/Test/HlslTestUtils.h                 | 7 ++++---
 tools/clang/unittests/HLSLExec/ExecutionTest.cpp | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/dxc/Test/HlslTestUtils.h b/include/dxc/Test/HlslTestUtils.h
index f7b941a1bb..324dfa6608 100644
--- a/include/dxc/Test/HlslTestUtils.h
+++ b/include/dxc/Test/HlslTestUtils.h
@@ -47,7 +47,8 @@
 #include "dxc/Test/TestConfig.h"
 #endif
 
-using namespace std;
+using std::min;
+using std::max;
 
 #ifndef HLSLDATAFILEPARAM
 #define HLSLDATAFILEPARAM L"HlslDataDir"
@@ -121,12 +122,12 @@ static constexpr wchar_t wideWhitespaceChars[] = L" \t\r\n";
 
 inline std::string strltrim(const std::string &value) {
   size_t first = value.find_first_not_of(whitespaceChars);
-  return first == string::npos ? value : value.substr(first);
+  return first == std::string::npos ? value : value.substr(first);
 }
 
 inline std::string strrtrim(const std::string &value) {
   size_t last = value.find_last_not_of(whitespaceChars);
-  return last == string::npos ? value : value.substr(0, last + 1);
+  return last == std::string::npos ? value : value.substr(0, last + 1);
 }
 
 inline std::string strtrim(const std::string &value) {
diff --git a/tools/clang/unittests/HLSLExec/ExecutionTest.cpp b/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
index 65d4dde80b..8d0e20c21c 100644
--- a/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
+++ b/tools/clang/unittests/HLSLExec/ExecutionTest.cpp
@@ -9739,8 +9739,8 @@ TEST_F(ExecutionTest, PackUnpackTest) {
     return;
   }
 #else
-  string args = "-enable-16bit-types";
-  string target = "cs_6_6";
+  std::string args = "-enable-16bit-types";
+  std::string target = "cs_6_6";
 
   if (!createDevice(&pDevice, D3D_SHADER_MODEL_6_6)) {
     return;
@@ -10211,7 +10211,7 @@ TEST_F(ExecutionTest, DynamicResourcesDynamicIndexingTest) {
   st::ParseShaderOpSetFromStream(pStream, ShaderOpSet.get());
   st::ShaderOp *pShaderOp =
       ShaderOpSet->GetShaderOp("DynamicResourcesDynamicIndexing");
-  vector<st::ShaderOpRootValue> fallbackRootValues = pShaderOp->RootValues;
+  std::vector<st::ShaderOpRootValue> fallbackRootValues = pShaderOp->RootValues;
 
   bool Skipped = true;
 

From 85fdf94f7fccfcda2423f28f57cfc2512e0e30b7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Apr 2026 19:47:37 +0000
Subject: [PATCH 2/2] chore: autopublish 2026-04-09T19:47:37Z

---
 include/dxc/Test/HlslTestUtils.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/dxc/Test/HlslTestUtils.h b/include/dxc/Test/HlslTestUtils.h
index 324dfa6608..a6a979cdb9 100644
--- a/include/dxc/Test/HlslTestUtils.h
+++ b/include/dxc/Test/HlslTestUtils.h
@@ -47,8 +47,8 @@
 #include "dxc/Test/TestConfig.h"
 #endif
 
-using std::min;
 using std::max;
+using std::min;
 
 #ifndef HLSLDATAFILEPARAM
 #define HLSLDATAFILEPARAM L"HlslDataDir"