There is no posix_category in std, use generic_category.

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

diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h
index 724e3cef92f3aad714017d37eebc46c77b15b4b1..396338c0ab3c5ef5a7f1701cc273de9c70feb2ae 100644 (file)
--- a/include/llvm/Support/system_error.h
+++ b/include/llvm/Support/system_error.h
@@ -650,11 +650,6 @@ public:
 const error_category& generic_category();
 const error_category& system_category();
 
-/// Get the error_category used for errno values from POSIX functions. This is
-/// the same as the system_category on POSIX systems, but is the same as the
-/// generic_category on Windows.
-const error_category& posix_category();
-
 class error_condition
 {
   int _val_;

diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp
index 88d862269fd0cdfda775a3ae8e618f5acc031d04..b7298090db4ccea4eda2c2909e79a52b01862781 100644 (file)
--- a/lib/Support/MemoryBuffer.cpp
+++ b/lib/Support/MemoryBuffer.cpp
@@ -222,7 +222,7 @@ static error_code getMemoryBufferForStream(int FD,
     ReadBytes = read(FD, Buffer.end(), ChunkSize);
     if (ReadBytes == -1) {
       if (errno == EINTR) continue;
-      return error_code(errno, posix_category());
+      return error_code(errno, generic_category());
     }
     Buffer.set_size(Buffer.size() + ReadBytes);
   } while (ReadBytes != 0);
@@ -370,7 +370,7 @@ static error_code getOpenFileImpl(int FD, const char *Filename,
   size_t BytesLeft = MapSize;
 #ifndef HAVE_PREAD
   if (lseek(FD, Offset, SEEK_SET) == -1)
-    return error_code(errno, posix_category());
+    return error_code(errno, generic_category());
 #endif
 
   while (BytesLeft) {
@@ -383,7 +383,7 @@ static error_code getOpenFileImpl(int FD, const char *Filename,
       if (errno == EINTR)
         continue;
       // Error while reading.
-      return error_code(errno, posix_category());
+      return error_code(errno, generic_category());
     }
     if (NumRead == 0) {
       memset(BufPtr, 0, BytesLeft); // zero-initialize rest of the buffer.

diff --git a/lib/Support/system_error.cpp b/lib/Support/system_error.cpp
index 0ca183e40a4e9f96c086fa3aa1e802a7589502ba..46b501eea0e6b3d24e866ccd8c367ab9506d7f69 100644 (file)
--- a/lib/Support/system_error.cpp
+++ b/lib/Support/system_error.cpp
@@ -96,15 +96,6 @@ system_category() {
   return s;
 }
 
-const error_category&
-posix_category() {
-#ifdef LLVM_ON_WIN32
-  return generic_category();
-#else
-  return system_category();
-#endif
-}
-
 // error_condition
 
 std::string