Revert "Replace "std::experimental::filesystem" with "std::filesystem" (#1153)"

This reverts commit 2a761d635c.
This commit is contained in:
Mike Harder 2018-08-03 15:44:35 -07:00 committed by GitHub
parent 2a761d635c
commit d199de2c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 21 deletions

View File

@ -6,7 +6,7 @@
#include "GlobalVersionUtility.h"
namespace fs = std::filesystem;
namespace fs = std::experimental::filesystem;
// throws runtime error if no request handler versions are installed.
// Throw invalid_argument if any argument is null

View File

@ -38,7 +38,7 @@ PollingAppOfflineApplication::AppOfflineExists()
}
std::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication)
std::experimental::filesystem::path PollingAppOfflineApplication::GetAppOfflineLocation(IHttpApplication& pApplication)
{
return std::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm";
return std::experimental::filesystem::path(pApplication.GetApplicationPhysicalPath()) / "app_offline.htm";
}

View File

@ -30,8 +30,8 @@ public:
void Stop(bool fServerInitiated) override { UNREFERENCED_PARAMETER(fServerInitiated); }
protected:
std::filesystem::path m_appOfflineLocation;
static std::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication);
std::experimental::filesystem::path m_appOfflineLocation;
static std::experimental::filesystem::path GetAppOfflineLocation(IHttpApplication& pApplication);
private:
static const int c_appOfflineRefreshIntervalMS = 200;

View File

@ -13,7 +13,7 @@
#include "HandleWrapper.h"
#include "Environment.h"
namespace fs = std::filesystem;
namespace fs = std::experimental::filesystem;
//
// Runs a standalone appliction.
@ -98,7 +98,7 @@ HOSTFXR_UTILITY::GetStandaloneHostfxrParameters(
}
BOOL
HOSTFXR_UTILITY::IsDotnetExecutable(const std::filesystem::path & dotnetPath)
HOSTFXR_UTILITY::IsDotnetExecutable(const std::experimental::filesystem::path & dotnetPath)
{
auto name = dotnetPath.filename();
name.replace_extension("");

View File

@ -44,7 +44,7 @@ public:
static
BOOL
IsDotnetExecutable(
_In_ const std::filesystem::path & dotnetPath
_In_ const std::experimental::filesystem::path & dotnetPath
);
static
@ -74,25 +74,25 @@ public:
);
static
std::optional<std::filesystem::path>
std::optional<std::experimental::filesystem::path>
GetAbsolutePathToHostFxr(
_In_ const std::filesystem::path & dotnetPath,
_In_ const std::experimental::filesystem::path & dotnetPath,
_In_ HANDLE hEventLog
);
static
std::optional<std::filesystem::path>
std::optional<std::experimental::filesystem::path>
GetAbsolutePathToDotnetFromProgramFiles();
static
std::optional<std::filesystem::path>
std::optional<std::experimental::filesystem::path>
InvokeWhereToFindDotnet();
static
std::optional<std::filesystem::path>
std::optional<std::experimental::filesystem::path>
GetAbsolutePathToDotnet(
_In_ const std::filesystem::path & applicationPath,
_In_ const std::filesystem::path & requestedPath
_In_ const std::experimental::filesystem::path & applicationPath,
_In_ const std::experimental::filesystem::path & requestedPath
);
};

View File

@ -41,7 +41,7 @@ namespace FileOutManagerStartupTests
wprintf(expected, out);
}
for (auto & p : std::filesystem::directory_iterator(tempDirectory.path()))
for (auto & p : std::experimental::filesystem::directory_iterator(tempDirectory.path()))
{
std::wstring filename(p.path().filename());
ASSERT_EQ(filename.substr(0, fileNamePrefix.size()), fileNamePrefix);

View File

@ -7,7 +7,7 @@
namespace GlobalVersionTests
{
using ::testing::Test;
namespace fs = std::filesystem;
namespace fs = std::experimental::filesystem;
class GlobalVersionTest : public Test
{

View File

@ -28,7 +28,7 @@ TempDirectory::TempDirectory()
RPC_CSTR szUuid = NULL;
if (UuidToStringA(&uuid, &szUuid) == RPC_S_OK)
{
m_path = std::filesystem::temp_directory_path() / reinterpret_cast<PCHAR>(szUuid);
m_path = std::experimental::filesystem::temp_directory_path() / szUuid;
RpcStringFreeA(&szUuid);
return;
}
@ -37,5 +37,5 @@ TempDirectory::TempDirectory()
TempDirectory::~TempDirectory()
{
std::filesystem::remove_all(m_path);
std::experimental::filesystem::remove_all(m_path);
}

View File

@ -18,11 +18,11 @@ public:
~TempDirectory();
std::filesystem::path path() const
std::experimental::filesystem::path path() const
{
return m_path;
}
private:
std::filesystem::path m_path;
std::experimental::filesystem::path m_path;
};