Skip to content

Commit 058e024

Browse files
committed
Remove architecture-related ifdef in hio
1 parent 0b7eb3c commit 058e024

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

pxr/imaging/hio/glslfx.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "pxr/base/tf/pathUtils.h"
2626
#include "pxr/base/tf/hash.h"
2727

28+
#include <filesystem>
2829
#include <iostream>
2930
#include <istream>
3031
#include <fstream>
@@ -232,11 +233,7 @@ static unique_ptr<istream>
232233
_CreateStreamForFile(string const& filePath)
233234
{
234235
if (TfIsFile(filePath)) {
235-
#if defined(ARCH_OS_WINDOWS)
236-
return make_unique<ifstream>(ArchWindowsUtf8ToUtf16(filePath));
237-
#else
238-
return make_unique<ifstream>(filePath);
239-
#endif
236+
return make_unique<ifstream>(std::filesystem::u8path(filePath));
240237
}
241238

242239
const shared_ptr<ArAsset> asset = ArGetResolver().OpenAsset(

0 commit comments

Comments
 (0)