6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-03 13:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Don't put generic_category in the llvm namespace.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210737 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-06-12 02:00:39 +00:00
parent 23475569d5
commit 81f207bf78
6 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/llvm/Support/system_error.h
View File

@ -18,7 +18,6 @@
namespace llvm {
using std::error_code;
using std::generic_category;
using std::make_error_code;
}

6
lib/Support/MemoryBuffer.cpp
View File

@ -222,7 +222,7 @@ static error_code getMemoryBufferForStream(int FD,
ReadBytes = read(FD, Buffer.end(), ChunkSize);
if (ReadBytes == -1) {
if (errno == EINTR) continue;
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
Buffer.set_size(Buffer.size() + ReadBytes);
} while (ReadBytes != 0);
@ -370,7 +370,7 @@ static error_code getOpenFileImpl(int FD, const char *Filename,
size_t BytesLeft = MapSize;
#ifndef HAVE_PREAD
if (lseek(FD, Offset, SEEK_SET) == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
#endif
while (BytesLeft) {
@ -383,7 +383,7 @@ static error_code getOpenFileImpl(int FD, const char *Filename,
if (errno == EINTR)
continue;
// Error while reading.
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
if (NumRead == 0) {
memset(BufPtr, 0, BytesLeft); // zero-initialize rest of the buffer.

2
lib/Support/Path.cpp
View File

@ -1030,7 +1030,7 @@ error_code identify_magic(const Twine &Path, file_magic &Result) {
char Buffer[32];
int Length = read(FD, Buffer, sizeof(Buffer));
if (Length < 0)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
Result = identify_magic(StringRef(Buffer, Length));
return error_code();

10
lib/Support/Unix/Memory.inc
View File

@ -95,7 +95,7 @@ Memory::allocateMappedMemory(size_t NumBytes,
#ifdef NEED_DEV_ZERO_FOR_MMAP
static int zero_fd = open("/dev/zero", O_RDWR);
if (zero_fd == -1) {
EC = error_code(errno, generic_category());
EC = error_code(errno, std::generic_category());
return MemoryBlock();
}
fd = zero_fd;
@ -123,7 +123,7 @@ Memory::allocateMappedMemory(size_t NumBytes,
if (NearBlock) //Try again without a near hint
return allocateMappedMemory(NumBytes, nullptr, PFlags, EC);
EC = error_code(errno, generic_category());
EC = error_code(errno, std::generic_category());
return MemoryBlock();
}
@ -143,7 +143,7 @@ Memory::releaseMappedMemory(MemoryBlock &M) {
return error_code();
if (0 != ::munmap(M.Address, M.Size))
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
M.Address = nullptr;
M.Size = 0;
@ -157,13 +157,13 @@ Memory::protectMappedMemory(const MemoryBlock &M, unsigned Flags) {
return error_code();
if (!Flags)
return error_code(EINVAL, generic_category());
return error_code(EINVAL, std::generic_category());
int Protect = getPosixProtectionFlags(Flags);
int Result = ::mprotect(M.Address, M.Size, Protect);
if (Result != 0)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
if (Flags & MF_EXEC)
Memory::InvalidateInstructionCache(M.Address, M.Size);

38
lib/Support/Unix/Path.inc
View File

@ -249,7 +249,7 @@ error_code current_path(SmallVectorImpl<char> &result) {
if (::getcwd(result.data(), result.capacity()) == nullptr) {
// See if there was a real error.
if (errno != ENOMEM)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
// Otherwise there just wasn't enough space.
result.reserve(result.capacity() * 2);
} else
@ -266,7 +266,7 @@ error_code create_directory(const Twine &path, bool IgnoreExisting) {
if (::mkdir(p.begin(), S_IRWXU | S_IRWXG) == -1) {
if (errno != EEXIST || !IgnoreExisting)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
return error_code();
@ -295,7 +295,7 @@ error_code create_link(const Twine &to, const Twine &from) {
StringRef t = to.toNullTerminatedStringRef(to_storage);
if (::symlink(t.begin(), f.begin()) == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
}
@ -307,7 +307,7 @@ error_code remove(const Twine &path, bool IgnoreNonExisting) {
struct stat buf;
if (lstat(p.begin(), &buf) != 0) {
if (errno != ENOENT || !IgnoreNonExisting)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
}
@ -321,7 +321,7 @@ error_code remove(const Twine &path, bool IgnoreNonExisting) {
if (::remove(p.begin()) == -1) {
if (errno != ENOENT || !IgnoreNonExisting)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
return error_code();
@ -335,7 +335,7 @@ error_code rename(const Twine &from, const Twine &to) {
StringRef t = to.toNullTerminatedStringRef(to_storage);
if (::rename(f.begin(), t.begin()) == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
}
@ -345,7 +345,7 @@ error_code resize_file(const Twine &path, uint64_t size) {
StringRef p = path.toNullTerminatedStringRef(path_storage);
if (::truncate(p.begin(), size) == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
}
@ -356,7 +356,7 @@ error_code exists(const Twine &path, bool &result) {
if (::access(p.begin(), F_OK) == -1) {
if (errno != ENOENT)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
result = false;
} else
result = true;
@ -401,7 +401,7 @@ error_code equivalent(const Twine &A, const Twine &B, bool &result) {
static error_code fillStatus(int StatRet, const struct stat &Status,
file_status &Result) {
if (StatRet != 0) {
error_code ec(errno, generic_category());
error_code ec(errno, std::generic_category());
if (ec == std::errc::no_such_file_or_directory)
Result = file_status(file_type::file_not_found);
else
@ -454,7 +454,7 @@ error_code setLastModificationAndAccessTime(int FD, TimeValue Time) {
Times[0].tv_nsec = 0;
Times[1] = Times[0];
if (::futimens(FD, Times))
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
#elif defined(HAVE_FUTIMES)
timeval Times[2];
@ -462,7 +462,7 @@ error_code setLastModificationAndAccessTime(int FD, TimeValue Time) {
Times[0].tv_usec = 0;
Times[1] = Times[0];
if (::futimes(FD, Times))
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
#else
#warning Missing futimes() and futimens()
@ -478,7 +478,7 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) {
// Figure out how large the file is.
struct stat FileInfo;
if (fstat(FD, &FileInfo) == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
uint64_t FileSize = FileInfo.st_size;
if (Size == 0)
@ -486,7 +486,7 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) {
else if (FileSize < Size) {
// We need to grow the file.
if (ftruncate(FD, Size) == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
int flags = (Mode == readwrite) ? MAP_SHARED : MAP_PRIVATE;
@ -496,7 +496,7 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) {
#endif
Mapping = ::mmap(nullptr, Size, prot, flags, FD, Offset);
if (Mapping == MAP_FAILED)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
return error_code();
}
@ -519,7 +519,7 @@ mapped_file_region::mapped_file_region(const Twine &path,
int oflags = (mode == readonly) ? O_RDONLY : O_RDWR;
int ofd = ::open(name.begin(), oflags);
if (ofd == -1) {
ec = error_code(errno, generic_category());
ec = error_code(errno, std::generic_category());
return;
}
@ -588,7 +588,7 @@ error_code detail::directory_iterator_construct(detail::DirIterState &it,
SmallString<128> path_null(path);
DIR *directory = ::opendir(path_null.c_str());
if (!directory)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
it.IterationHandle = reinterpret_cast<intptr_t>(directory);
// Add something for replace_filename to replace.
@ -609,7 +609,7 @@ error_code detail::directory_iterator_increment(detail::DirIterState &it) {
errno = 0;
dirent *cur_dir = ::readdir(reinterpret_cast<DIR *>(it.IterationHandle));
if (cur_dir == nullptr && errno != 0) {
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
} else if (cur_dir != nullptr) {
StringRef name(cur_dir->d_name, NAMLEN(cur_dir));
if ((name.size() == 1 && name[0] == '.') ||
@ -627,7 +627,7 @@ error_code openFileForRead(const Twine &Name, int &ResultFD) {
StringRef P = Name.toNullTerminatedStringRef(Storage);
while ((ResultFD = open(P.begin(), O_RDONLY)) < 0) {
if (errno != EINTR)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
return error_code();
}
@ -657,7 +657,7 @@ error_code openFileForWrite(const Twine &Name, int &ResultFD,
StringRef P = Name.toNullTerminatedStringRef(Storage);
while ((ResultFD = open(P.begin(), OpenFlags, Mode)) < 0) {
if (errno != EINTR)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
}
return error_code();
}

4
lib/Support/Windows/Path.inc
View File

@ -259,14 +259,14 @@ error_code resize_file(const Twine &path, uint64_t size) {
int fd = ::_wopen(path_utf16.begin(), O_BINARY | _O_RDWR, S_IWRITE);
if (fd == -1)
return error_code(errno, generic_category());
return error_code(errno, std::generic_category());
#ifdef HAVE__CHSIZE_S
errno_t error = ::_chsize_s(fd, size);
#else
errno_t error = ::_chsize(fd, size);
#endif
::close(fd);
return error_code(error, generic_category());
return error_code(error, std::generic_category());
}
error_code exists(const Twine &path, bool &result) {