diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-13 03:20:08 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-06-13 03:20:08 +0000 |
commit | c049c6574b93d774e572f13db1e8cea7bdb2d982 (patch) | |
tree | 3d400b852ce1e644e4d1164484f8c69a23f6a1f8 /llvm/unittests/Support/Path.cpp | |
parent | 4453e4294515bfc0cff16fdd7278f217d9efba4f (diff) | |
download | llvm-c049c6574b93d774e572f13db1e8cea7bdb2d982.zip llvm-c049c6574b93d774e572f13db1e8cea7bdb2d982.tar.gz llvm-c049c6574b93d774e572f13db1e8cea7bdb2d982.tar.bz2 |
Remove the last uses of 'using std::error_code'
This finishes the transition to std::error_code.
llvm-svn: 210877
Diffstat (limited to 'llvm/unittests/Support/Path.cpp')
-rw-r--r-- | llvm/unittests/Support/Path.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp index 0904211..babeb53 100644 --- a/llvm/unittests/Support/Path.cpp +++ b/llvm/unittests/Support/Path.cpp @@ -20,17 +20,17 @@ using namespace llvm; using namespace llvm::sys; -using std::error_code; - -#define ASSERT_NO_ERROR(x) \ - if (error_code ASSERT_NO_ERROR_ec = x) { \ - SmallString<128> MessageStorage; \ - raw_svector_ostream Message(MessageStorage); \ - Message << #x ": did not return errc::success.\n" \ - << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n" \ - << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \ - GTEST_FATAL_FAILURE_(MessageStorage.c_str()); \ - } else {} + +#define ASSERT_NO_ERROR(x) \ + if (std::error_code ASSERT_NO_ERROR_ec = x) { \ + SmallString<128> MessageStorage; \ + raw_svector_ostream Message(MessageStorage); \ + Message << #x ": did not return errc::success.\n" \ + << "error number: " << ASSERT_NO_ERROR_ec.value() << "\n" \ + << "error message: " << ASSERT_NO_ERROR_ec.message() << "\n"; \ + GTEST_FATAL_FAILURE_(MessageStorage.c_str()); \ + } else { \ + } namespace { @@ -357,7 +357,7 @@ TEST_F(FileSystemTest, TempFiles) { ASSERT_EQ(fs::remove(Twine(TempPath2), false), std::errc::no_such_file_or_directory); - error_code EC = fs::status(TempPath2.c_str(), B); + std::error_code EC = fs::status(TempPath2.c_str(), B); EXPECT_EQ(EC, std::errc::no_such_file_or_directory); EXPECT_EQ(B.type(), fs::file_type::file_not_found); @@ -411,7 +411,7 @@ TEST_F(FileSystemTest, CreateDir) { } TEST_F(FileSystemTest, DirectoryIteration) { - error_code ec; + std::error_code ec; for (fs::directory_iterator i(".", ec), e; i != e; i.increment(ec)) ASSERT_NO_ERROR(ec); @@ -583,7 +583,7 @@ TEST_F(FileSystemTest, FileMapping) { ASSERT_NO_ERROR( fs::createTemporaryFile("prefix", "temp", FileDescriptor, TempPath)); // Map in temp file and add some content - error_code EC; + std::error_code EC; StringRef Val("hello there"); { fs::mapped_file_region mfr(FileDescriptor, |