15 files changed, 16 insertions, 4 deletions
diff --git a/lib/Support/DataStream.cpp b/lib/Support/DataStream.cpp
index 830bd8adb9..0d8a800d70 100644
--- a/lib/Support/DataStream.cpp
+++ b/lib/Support/DataStream.cpp
@@ -28,6 +28,7 @@
 #include <io.h>
 #endif
 using namespace llvm;
+using std::error_code;
 
 #define DEBUG_TYPE "Data-stream"
 
diff --git a/lib/Support/FileOutputBuffer.cpp b/lib/Support/FileOutputBuffer.cpp
index 96fa58767e..68f6fa16f9 100644
--- a/lib/Support/FileOutputBuffer.cpp
+++ b/lib/Support/FileOutputBuffer.cpp
@@ -17,6 +17,7 @@
 #include <system_error>
 
 using llvm::sys::fs::mapped_file_region;
+using std::error_code;
 
 namespace llvm {
 FileOutputBuffer::FileOutputBuffer(mapped_file_region * R,
diff --git a/lib/Support/FileUtilities.cpp b/lib/Support/FileUtilities.cpp
index 68953d347f..729e44789c 100644
--- a/lib/Support/FileUtilities.cpp
+++ b/lib/Support/FileUtilities.cpp
@@ -22,6 +22,7 @@
 #include <cstring>
 #include <system_error>
 using namespace llvm;
+using std::error_code;
 
 static bool isSignedChar(char C) {
   return (C == '+' || C == '-');
diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp
index 306f3e89d0..e68ee434dd 100644
--- a/lib/Support/GraphWriter.cpp
+++ b/lib/Support/GraphWriter.cpp
@@ -68,7 +68,7 @@ StringRef llvm::DOT::getColorString(unsigned ColorNumber) {
 std::string llvm::createGraphFilename(const Twine &Name, int &FD) {
   FD = -1;
   SmallString<128> Filename;
-  error_code EC = sys::fs::createTemporaryFile(Name, "dot", FD, Filename);
+  std::error_code EC = sys::fs::createTemporaryFile(Name, "dot", FD, Filename);
   if (EC) {
     errs() << "Error: " << EC.message() << "\n";
     return "";
diff --git a/lib/Support/LockFileManager.cpp b/lib/Support/LockFileManager.cpp
index b050e5de8d..0204e75f84 100644
--- a/lib/Support/LockFileManager.cpp
+++ b/lib/Support/LockFileManager.cpp
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #endif
 using namespace llvm;
+using std::error_code;
 
 /// \brief Attempt to read the lock file with the given name, if it exists.
 ///
diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp
index 0164443ad5..c395ce72b8 100644
--- a/lib/Support/MemoryBuffer.cpp
+++ b/lib/Support/MemoryBuffer.cpp
@@ -33,6 +33,7 @@
 #include <io.h>
 #endif
 using namespace llvm;
+using std::error_code;
 
 //===----------------------------------------------------------------------===//
 // MemoryBuffer implementation itself.
diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp
index dabf763c8d..13e3a8ad02 100644
--- a/lib/Support/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -28,6 +28,7 @@
 #endif
 
 using namespace llvm;
+using std::error_code;
 
 namespace {
   using llvm::StringRef;
diff --git a/lib/Support/Unix/Memory.inc b/lib/Support/Unix/Memory.inc
index 10de038f43..cca3782949 100644
--- a/lib/Support/Unix/Memory.inc
+++ b/lib/Support/Unix/Memory.inc
@@ -37,6 +37,7 @@ extern "C" void sys_icache_invalidate(const void *Addr, size_t len);
 #else
 extern "C" void __clear_cache(void *, void*);
 #endif
+using std::error_code;
 
 namespace {
 
diff --git a/lib/Support/Unix/Process.inc b/lib/Support/Unix/Process.inc
index d927bb539e..ea2b8dcda2 100644
--- a/lib/Support/Unix/Process.inc
+++ b/lib/Support/Unix/Process.inc
@@ -46,7 +46,7 @@
 
 using namespace llvm;
 using namespace sys;
-
+using std::error_code;
 
 process::id_type self_process::get_id() {
   return getpid();
diff --git a/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc
index f4c6cdf7e9..d850664334 100644
--- a/lib/Support/Unix/Program.inc
+++ b/lib/Support/Unix/Program.inc
@@ -48,6 +48,8 @@
 #endif
 
 namespace llvm {
+using std::error_code;
+
 using namespace sys;
 
 ProcessInfo::ProcessInfo() : Pid(0), ReturnCode(0) {}
diff --git a/lib/Support/Windows/Memory.inc b/lib/Support/Windows/Memory.inc
index d410df35aa..431cfb6cf9 100644
--- a/lib/Support/Windows/Memory.inc
+++ b/lib/Support/Windows/Memory.inc
@@ -19,6 +19,7 @@
 
 // The Windows.h header must be the last one included.
 #include "WindowsSupport.h"
+using std::error_code;
 
 namespace {
 
diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc
index 0be871c695..c88557c5ee 100644
--- a/lib/Support/Windows/Process.inc
+++ b/lib/Support/Windows/Process.inc
@@ -48,7 +48,7 @@
 
 using namespace llvm;
 using namespace sys;
-
+using std::error_code;
 
 process::id_type self_process::get_id() {
   return GetCurrentProcessId();
diff --git a/lib/Support/Windows/Program.inc b/lib/Support/Windows/Program.inc
index 6c7ddbde33..8d1df5ffc9 100644
--- a/lib/Support/Windows/Program.inc
+++ b/lib/Support/Windows/Program.inc
@@ -24,6 +24,7 @@
 //===----------------------------------------------------------------------===//
 
 namespace llvm {
+using std::error_code;
 using namespace sys;
 
 ProcessInfo::ProcessInfo() : ProcessHandle(0), Pid(0), ReturnCode(0) {}
diff --git a/lib/Support/YAMLTraits.cpp b/lib/Support/YAMLTraits.cpp
index 66af33693d..0042c29036 100644
--- a/lib/Support/YAMLTraits.cpp
+++ b/lib/Support/YAMLTraits.cpp
@@ -18,6 +18,7 @@
 #include <cstring>
 using namespace llvm;
 using namespace yaml;
+using std::error_code;
 
 //===----------------------------------------------------------------------===//
 //  IO
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 6a61b1b2a6..f7c213ac2b 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -450,7 +450,7 @@ raw_fd_ostream::raw_fd_ostream(const char *Filename, std::string &ErrorInfo,
     return;
   }
 
-  error_code EC = sys::fs::openFileForWrite(Filename, FD, Flags);
+  std::error_code EC = sys::fs::openFileForWrite(Filename, FD, Flags);
 
   if (EC) {
     ErrorInfo = "Error opening output file '" + std::string(Filename) + "': " +