Don't import make_error_code into the llvm namespace.
llvm-svn: 210772
diff --git a/llvm/lib/Support/FileOutputBuffer.cpp b/llvm/lib/Support/FileOutputBuffer.cpp
index b869054..c8ed1dd 100644
--- a/llvm/lib/Support/FileOutputBuffer.cpp
+++ b/llvm/lib/Support/FileOutputBuffer.cpp
@@ -51,7 +51,7 @@
if (EC)
return EC;
else
- return make_error_code(std::errc::operation_not_permitted);
+ return std::make_error_code(std::errc::operation_not_permitted);
}
// Delete target file.
diff --git a/llvm/lib/Support/LockFileManager.cpp b/llvm/lib/Support/LockFileManager.cpp
index 2b7fc81..b050e5d 100644
--- a/llvm/lib/Support/LockFileManager.cpp
+++ b/llvm/lib/Support/LockFileManager.cpp
@@ -114,7 +114,7 @@
if (Out.has_error()) {
// We failed to write out PID, so make up an excuse, remove the
// unique lock file, and fail.
- Error = make_error_code(std::errc::no_space_on_device);
+ Error = std::make_error_code(std::errc::no_space_on_device);
sys::fs::remove(UniqueLockFileName.c_str());
return;
}
diff --git a/llvm/lib/Support/MemoryBuffer.cpp b/llvm/lib/Support/MemoryBuffer.cpp
index b1ebbf8..ab554cb 100644
--- a/llvm/lib/Support/MemoryBuffer.cpp
+++ b/llvm/lib/Support/MemoryBuffer.cpp
@@ -361,7 +361,7 @@
if (!Buf) {
// Failed to create a buffer. The only way it can fail is if
// new(std::nothrow) returns 0.
- return make_error_code(std::errc::not_enough_memory);
+ return std::make_error_code(std::errc::not_enough_memory);
}
std::unique_ptr<MemoryBuffer> SB(Buf);
diff --git a/llvm/lib/Support/Windows/Path.inc b/llvm/lib/Support/Windows/Path.inc
index 662f301..a26d9e8 100644
--- a/llvm/lib/Support/Windows/Path.inc
+++ b/llvm/lib/Support/Windows/Path.inc
@@ -475,7 +475,7 @@
_close(FileDescriptor);
} else
::CloseHandle(FileHandle);
- return make_error_code(std::errc::invalid_argument);
+ return std::make_error_code(std::errc::invalid_argument);
}
DWORD flprotect;
@@ -611,7 +611,7 @@
if (closefd)
_close(FileDescriptor);
FileDescriptor = 0;
- ec = make_error_code(std::errc::bad_file_descriptor);
+ ec = std::make_error_code(std::errc::bad_file_descriptor);
return;
}
@@ -774,7 +774,7 @@
if (LastError != ERROR_ACCESS_DENIED)
return EC;
if (is_directory(Name))
- return make_error_code(std::errc::is_a_directory);
+ return std::make_error_code(std::errc::is_a_directory);
return EC;
}
@@ -826,7 +826,7 @@
if (LastError != ERROR_ACCESS_DENIED)
return EC;
if (is_directory(Name))
- return make_error_code(std::errc::is_a_directory);
+ return std::make_error_code(std::errc::is_a_directory);
return EC;
}
diff --git a/llvm/lib/Support/YAMLTraits.cpp b/llvm/lib/Support/YAMLTraits.cpp
index ed80eac..66af336 100644
--- a/llvm/lib/Support/YAMLTraits.cpp
+++ b/llvm/lib/Support/YAMLTraits.cpp
@@ -74,7 +74,7 @@
Node *N = DocIterator->getRoot();
if (!N) {
assert(Strm->failed() && "Root is NULL iff parsing failed");
- EC = make_error_code(std::errc::invalid_argument);
+ EC = std::make_error_code(std::errc::invalid_argument);
return false;
}
@@ -124,7 +124,7 @@
// nodes are present.
if (!CurrentNode) {
if (Required)
- EC = make_error_code(std::errc::invalid_argument);
+ EC = std::make_error_code(std::errc::invalid_argument);
return false;
}
@@ -300,7 +300,7 @@
void Input::setError(Node *node, const Twine &message) {
Strm->printError(node, message);
- EC = make_error_code(std::errc::invalid_argument);
+ EC = std::make_error_code(std::errc::invalid_argument);
}
Input::HNode *Input::createHNodes(Node *N) {