Skip to content

Fix modern MSVC compilation error on experimental/filesystem #8469

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
bob80905 merged 7 commits into from
May 26, 2026
+15 −7
Merged

Fix modern MSVC compilation error on experimental/filesystem #8469

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cbdebaf
fix modern MSVC
bob80905 May 21, 2026
521ae42
repair
bob80905 May 21, 2026
b433d21
format
bob80905 May 21, 2026
3aaa95d
fix missing endif
bob80905 May 21, 2026
54e02ab
fix macos
bob80905 May 22, 2026
6b84fe1
chore: autopublish 2026-05-22T17:58:08Z
github-actions[bot] May 22, 2026
65b2b85
address Helena
bob80905 May 26, 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
22 changes: 15 additions & 7 deletions tools/clang/unittests/HLSL/DxilContainerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,23 @@
#include <atlfile.h>
#include <d3dcompiler.h>
#pragma comment(lib, "d3dcompiler.lib")
#if _MSC_VER >= 1920
#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
#include <experimental/filesystem>
#else
#include <filesystem>
#endif

#if defined(_MSC_VER)
// MSVC removed <experimental/filesystem> starting in VS 2019 16.3 (_MSC_VER >= 1922)
#if (_MSC_VER >= 1920) && (_MSC_VER < 1922)
#include <experimental/filesystem>
namespace fs = std::experimental::filesystem;
#else
#include <filesystem>
namespace fs = std::filesystem;
#endif
#else
#include <filesystem>
namespace fs = std::filesystem;
#endif

using namespace fs;

#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
Expand Down Expand Up @@ -72,8 +82,6 @@ using namespace std;
using namespace hlsl_test;
#ifdef _WIN32

using namespace std::experimental::filesystem;

static uint8_t MaskCount(uint8_t V) {
DXASSERT_NOMSG(0 <= V && V <= 0xF);
static const uint8_t Count[16] = {0, 1, 1, 2, 1, 2, 2, 3,
Expand Down
Loading