summaryrefslogtreecommitdiffstats
path: root/llvm/unittests
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-06-13 17:20:48 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-06-13 17:20:48 +0000
commit2a826e40fa51fcae4adb564d789cafe95776e0bb (patch)
treefc0dea973c66e8777a6354c1e01199057d38b023 /llvm/unittests
parent372bc70c639a45e69a519a2e47f0b9a06e23914a (diff)
downloadbcm5719-llvm-2a826e40fa51fcae4adb564d789cafe95776e0bb.tar.gz
bcm5719-llvm-2a826e40fa51fcae4adb564d789cafe95776e0bb.zip
Finishing touch for the std::error_code transition.
While std::error_code itself seems to work OK in all platforms, there are few annoying differences with regards to the std::errc enumeration. This patch adds a simple llvm enumeration, which will hopefully avoid build breakages in other platforms and surprises as we get more uses of std::error_code. llvm-svn: 210920
Diffstat (limited to 'llvm/unittests')
-rw-r--r--llvm/unittests/Support/ErrorOrTest.cpp5
-rw-r--r--llvm/unittests/Support/Path.cpp9
-rw-r--r--llvm/unittests/Transforms/DebugIR/DebugIR.cpp3
3 files changed, 10 insertions, 7 deletions
diff --git a/llvm/unittests/Support/ErrorOrTest.cpp b/llvm/unittests/Support/ErrorOrTest.cpp
index 976a95379a1..d76e7d62421 100644
--- a/llvm/unittests/Support/ErrorOrTest.cpp
+++ b/llvm/unittests/Support/ErrorOrTest.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/ErrorOr.h"
+#include "llvm/Support/Errc.h"
#include "gtest/gtest.h"
#include <memory>
@@ -16,7 +17,7 @@ using namespace llvm;
namespace {
ErrorOr<int> t1() {return 1;}
-ErrorOr<int> t2() { return std::errc::invalid_argument; }
+ErrorOr<int> t2() { return errc::invalid_argument; }
TEST(ErrorOr, SimpleValue) {
ErrorOr<int> a = t1();
@@ -30,7 +31,7 @@ TEST(ErrorOr, SimpleValue) {
a = t2();
EXPECT_FALSE(a);
- EXPECT_EQ(std::errc::invalid_argument, a.getError());
+ EXPECT_EQ(a.getError(), errc::invalid_argument);
#ifdef EXPECT_DEBUG_DEATH
EXPECT_DEBUG_DEATH(*a, "Cannot get value when an error exists");
#endif
diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp
index babeb53a114..da1bd223957 100644
--- a/llvm/unittests/Support/Path.cpp
+++ b/llvm/unittests/Support/Path.cpp
@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/Path.h"
+#include "llvm/Support/Errc.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -355,10 +356,10 @@ TEST_F(FileSystemTest, TempFiles) {
ASSERT_NO_ERROR(fs::remove(Twine(TempPath2)));
ASSERT_NO_ERROR(fs::remove(Twine(TempPath2)));
ASSERT_EQ(fs::remove(Twine(TempPath2), false),
- std::errc::no_such_file_or_directory);
+ errc::no_such_file_or_directory);
std::error_code EC = fs::status(TempPath2.c_str(), B);
- EXPECT_EQ(EC, std::errc::no_such_file_or_directory);
+ EXPECT_EQ(EC, errc::no_such_file_or_directory);
EXPECT_EQ(B.type(), fs::file_type::file_not_found);
// Make sure Temp2 doesn't exist.
@@ -398,7 +399,7 @@ TEST_F(FileSystemTest, TempFiles) {
"abcdefghijklmnopqrstuvwxyz3abcdefghijklmnopqrstuvwxyz2"
"abcdefghijklmnopqrstuvwxyz1abcdefghijklmnopqrstuvwxyz0";
EXPECT_EQ(fs::createUniqueFile(Twine(Path270), FileDescriptor, TempPath),
- std::errc::no_such_file_or_directory);
+ errc::no_such_file_or_directory);
#endif
}
@@ -406,7 +407,7 @@ TEST_F(FileSystemTest, CreateDir) {
ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "foo"));
ASSERT_NO_ERROR(fs::create_directory(Twine(TestDirectory) + "foo"));
ASSERT_EQ(fs::create_directory(Twine(TestDirectory) + "foo", false),
- std::errc::file_exists);
+ errc::file_exists);
ASSERT_NO_ERROR(fs::remove(Twine(TestDirectory) + "foo"));
}
diff --git a/llvm/unittests/Transforms/DebugIR/DebugIR.cpp b/llvm/unittests/Transforms/DebugIR/DebugIR.cpp
index c4ebc5cfa4a..41df1472168 100644
--- a/llvm/unittests/Transforms/DebugIR/DebugIR.cpp
+++ b/llvm/unittests/Transforms/DebugIR/DebugIR.cpp
@@ -18,6 +18,7 @@
#include "llvm/IR/DIBuilder.h"
#include "llvm/IR/DebugInfo.h"
#include "llvm/IR/Module.h"
+#include "llvm/Support/Errc.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Host.h"
#include "llvm/Support/Path.h"
@@ -58,7 +59,7 @@ bool removeIfExists(StringRef Path) {
// This is an approximation, on error we don't know in general if the file
// existed or not.
std::error_code EC = sys::fs::remove(Path, false);
- return EC != std::errc::no_such_file_or_directory;
+ return EC != llvm::errc::no_such_file_or_directory;
}
char * current_dir() {
OpenPOWER on IntegriCloud