Don't import make_error_code into the llvm namespace.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210772 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/Support/ErrorOr.h b/include/llvm/Support/ErrorOr.h
index e877b6ab9d4e4507e710b244b9aa58b981844745..d2a316fbf407d3021fa53bf62dc01d5b75db6547 100644 (file)
--- a/include/llvm/Support/ErrorOr.h
+++ b/include/llvm/Support/ErrorOr.h
@@ -99,6 +99,7 @@ public:
                                       std::is_error_condition_enum<E>::value,
                                   void *>::type = 0)
       : HasError(true) {
+    using std::make_error_code;
     new (getErrorStorage()) error_code(make_error_code(ErrorCode));
   }
 

diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h
index 84b9e2b85ad012ac538fa4f66606ddf90333a728..1b48ba935e90e93f827264dfad4fc68bc269a25d 100644 (file)
--- a/include/llvm/Support/system_error.h
+++ b/include/llvm/Support/system_error.h
@@ -18,7 +18,6 @@
 
 namespace llvm {
 using std::error_code;
-using std::make_error_code;
 }
 
 #endif

diff --git a/lib/Support/FileOutputBuffer.cpp b/lib/Support/FileOutputBuffer.cpp
index b869054338889a1eb8539dbceba35bd3551d9269..c8ed1ddef656c9feca3079e7e9f636edfce14d41 100644 (file)
--- a/lib/Support/FileOutputBuffer.cpp
+++ b/lib/Support/FileOutputBuffer.cpp
@@ -51,7 +51,7 @@ error_code FileOutputBuffer::create(StringRef FilePath,
       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/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp
index 2b7fc812d51972700ee0fcceb989609b03384a5c..b050e5de8d48720982dc2ce8da6c3930ff7fac35 100644 (file)
--- a/lib/Support/LockFileManager.cpp
+++ b/lib/Support/LockFileManager.cpp
@@ -114,7 +114,7 @@ LockFileManager::LockFileManager(StringRef FileName)
     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/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp
index b1ebbf8e4f35c06c61ef4c68a481d0053b22cd5f..ab554cbfd538a438ef54f15d6df7b1bdd9eb49b4 100644 (file)
--- a/lib/Support/MemoryBuffer.cpp
+++ b/lib/Support/MemoryBuffer.cpp
@@ -361,7 +361,7 @@ static error_code getOpenFileImpl(int FD, const char *Filename,
   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/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc
index 662f3019de7d512afc7ff217b3b7672f295b88c6..a26d9e89e6c6b6f6ccc6d108cfd2cfbf63f72088 100644 (file)
--- a/lib/Support/Windows/Path.inc
+++ b/lib/Support/Windows/Path.inc
@@ -475,7 +475,7 @@ error_code mapped_file_region::init(int FD, bool CloseFD, uint64_t Offset) {
         _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 @@ mapped_file_region::mapped_file_region(int fd,
     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 @@ error_code openFileForRead(const Twine &Name, int &ResultFD) {
     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 @@ error_code openFileForWrite(const Twine &Name, int &ResultFD,
     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/lib/Support/YAMLTraits.cpp b/lib/Support/YAMLTraits.cpp
index ed80eac76a9f17934484a09bed25df55c6141382..66af33693d67545745bc8d5e71b91a69dde727b7 100644 (file)
--- a/lib/Support/YAMLTraits.cpp
+++ b/lib/Support/YAMLTraits.cpp
@@ -74,7 +74,7 @@ bool Input::setCurrentDocument() {
     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 @@ bool Input::preflightKey(const char *Key, bool Required, bool, bool &UseDefault,
   // 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(HNode *hnode, const Twine &message) {
 
 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) {

diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp
index 77914c5792b27e688efe238fdbd6fae2c475dd7b..47e8d8de16edd476599c09f025ed798654ffc97b 100644 (file)
--- a/tools/llvm-ar/llvm-ar.cpp
+++ b/tools/llvm-ar/llvm-ar.cpp
@@ -453,7 +453,7 @@ int NewArchiveIterator::getFD() const {
   // Linux cannot open directories with open(2), although
   // cygwin and *bsd can.
   if (NewStatus.type() == sys::fs::file_type::directory_file)
-    failIfError(make_error_code(std::errc::is_a_directory), NewFilename);
+    failIfError(std::make_error_code(std::errc::is_a_directory), NewFilename);
 
   return NewFD;
 }