maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Use make_error_code in preparation for making errc an enum class. 

llvm-svn: 209956
This commit is contained in:
Rafael Espindola 2014-05-31 02:23:01 +00:00
parent 4461de208a
commit fd148d0b6f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Basic/VirtualFileSystem.cpp
View File

@ -201,7 +201,7 @@ ErrorOr<Status> OverlayFileSystem::status(const Twine &Path) {
if (Status || Status.getError() != errc::no_such_file_or_directory)
return Status;
}
return error_code(errc::no_such_file_or_directory, system_category());
return make_error_code(errc::no_such_file_or_directory);
}
error_code OverlayFileSystem::openFileForRead(const llvm::Twine &Path,
@ -212,7 +212,7 @@ error_code OverlayFileSystem::openFileForRead(const llvm::Twine &Path,
if (!EC || EC != errc::no_such_file_or_directory)
return EC;
}
return error_code(errc::no_such_file_or_directory, system_category());
return make_error_code(errc::no_such_file_or_directory);
}
//===-----------------------------------------------------------------------===/
@ -744,7 +744,7 @@ ErrorOr<Entry *> VFSFromYAML::lookupPath(const Twine &Path_) {
return EC;
if (Path.empty())
return error_code(errc::invalid_argument, system_category());
return make_error_code(errc::invalid_argument);
sys::path::const_iterator Start = sys::path::begin(Path);
sys::path::const_iterator End = sys::path::end(Path);
@ -754,7 +754,7 @@ ErrorOr<Entry *> VFSFromYAML::lookupPath(const Twine &Path_) {
if (Result || Result.getError() != errc::no_such_file_or_directory)
return Result;
}
return error_code(errc::no_such_file_or_directory, system_category());
return make_error_code(errc::no_such_file_or_directory);
}
ErrorOr<Entry *> VFSFromYAML::lookupPath(sys::path::const_iterator Start,
@ -767,7 +767,7 @@ ErrorOr<Entry *> VFSFromYAML::lookupPath(sys::path::const_iterator Start,
if (CaseSensitive ? !Start->equals(From->getName())
: !Start->equals_lower(From->getName()))
// failure to match
return error_code(errc::no_such_file_or_directory, system_category());
return make_error_code(errc::no_such_file_or_directory);
++Start;
@ -778,7 +778,7 @@ ErrorOr<Entry *> VFSFromYAML::lookupPath(sys::path::const_iterator Start,
DirectoryEntry *DE = dyn_cast<DirectoryEntry>(From);
if (!DE)
return error_code(errc::not_a_directory, system_category());
return make_error_code(errc::not_a_directory);
for (DirectoryEntry::iterator I = DE->contents_begin(),
E = DE->contents_end();
@ -787,7 +787,7 @@ ErrorOr<Entry *> VFSFromYAML::lookupPath(sys::path::const_iterator Start,
if (Result || Result.getError() != errc::no_such_file_or_directory)
return Result;
}
return error_code(errc::no_such_file_or_directory, system_category());
return make_error_code(errc::no_such_file_or_directory);
}
ErrorOr<Status> VFSFromYAML::status(const Twine &Path) {
@ -820,7 +820,7 @@ error_code VFSFromYAML::openFileForRead(const Twine &Path,
FileEntry *F = dyn_cast<FileEntry>(*E);
if (!F) // FIXME: errc::not_a_file?
return error_code(errc::invalid_argument, system_category());
return make_error_code(errc::invalid_argument);
if (error_code EC = ExternalFS->openFileForRead(F->getExternalContentsPath(),
Result))

2
clang/unittests/Basic/VirtualFileSystemTest.cpp
View File

@ -35,7 +35,7 @@ public:
std::map<std::string, vfs::Status>::iterator I =
FilesAndDirs.find(Path.str());
if (I == FilesAndDirs.end())
return error_code(errc::no_such_file_or_directory, posix_category());
return make_error_code(errc::no_such_file_or_directory);
return I->second;
}
error_code openFileForRead(const Twine &Path,