Skip to content

[SM6.10][HLK][Bugfix] Remove using std from common header #8358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
V-FEXrt merged 2 commits into from
Apr 9, 2026
+7 −6
Merged

[SM6.10][HLK][Bugfix] Remove using std from common header #8358

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48a54ee
[SM6.10][HLK] Remove using std from common header
V-FEXrt Apr 9, 2026
85fdf94
chore: autopublish 2026-04-09T19:47:37Z
github-actions[bot] Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions include/dxc/Test/HlslTestUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions tools/clang/unittests/HLSLExec/ExecutionTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
Loading