mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-08-05 13:26:55 +00:00
Prune #includes from llvm/Linker.h and llvm/System/Path.h,
forcing them down into various .cpp files. This change also: 1. Renames TimeValue::toString() and Path::toString() to ::str() for similarity with the STL. 2. Removes all stream insertion support for sys::Path, forcing clients to call .str(). 3. Removes a use of Config/alloca.h from bugpoint, using smallvector instead. 4. Weans llvm-db off <iostream> sys::Path really needs to be gutted, but I don't have the desire to do it at this point. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79869 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -808,8 +808,8 @@ CopyFile(const sys::Path &Dest, const sys::Path &Src, std::string* ErrMsg) {
|
||||
// Can't use CopyFile macro defined in Windows.h because it would mess up the
|
||||
// above line. We use the expansion it would have in a non-UNICODE build.
|
||||
if (!::CopyFileA(Src.c_str(), Dest.c_str(), false))
|
||||
return MakeErrMsg(ErrMsg, "Can't copy '" + Src.toString() +
|
||||
"' to '" + Dest.toString() + "': ");
|
||||
return MakeErrMsg(ErrMsg, "Can't copy '" + Src.str() +
|
||||
"' to '" + Dest.str() + "': ");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@@ -92,7 +92,7 @@ static HANDLE RedirectIO(const Path *path, int fd, std::string* ErrMsg) {
|
||||
if (path->isEmpty())
|
||||
fname = "NUL";
|
||||
else
|
||||
fname = path->toString().c_str();
|
||||
fname = path->c_str();
|
||||
|
||||
SECURITY_ATTRIBUTES sa;
|
||||
sa.nLength = sizeof(sa);
|
||||
@@ -258,11 +258,10 @@ Program::Execute(const Path& path,
|
||||
CloseHandle(si.hStdError);
|
||||
|
||||
// Now return an error if the process didn't get created.
|
||||
if (!rc)
|
||||
{
|
||||
if (!rc) {
|
||||
SetLastError(err);
|
||||
MakeErrMsg(ErrMsg, std::string("Couldn't execute program '") +
|
||||
path.toString() + "'");
|
||||
path.str() + "'");
|
||||
return false;
|
||||
}
|
||||
Pid_ = pi.dwProcessId;
|
||||
|
@@ -30,7 +30,7 @@ TimeValue TimeValue::now() {
|
||||
return t;
|
||||
}
|
||||
|
||||
std::string TimeValue::toString() const {
|
||||
std::string TimeValue::str() const {
|
||||
#ifdef __MINGW32__
|
||||
// This ban may be lifted by either:
|
||||
// (i) a future MinGW version other than 1.0 inherents the __time64_t type, or
|
||||
|
Reference in New Issue
Block a user