diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/llvm/IR/GVMaterializer.h | 4 | ||||
-rw-r--r-- | include/llvm/IR/Module.h | 2 | ||||
-rw-r--r-- | include/llvm/Object/Error.h | 3 | ||||
-rw-r--r-- | include/llvm/ProfileData/InstrProf.h | 4 | ||||
-rw-r--r-- | include/llvm/Support/ErrorOr.h | 3 | ||||
-rw-r--r-- | include/llvm/Support/FileSystem.h | 3 | ||||
-rw-r--r-- | include/llvm/Support/LockFileManager.h | 4 | ||||
-rw-r--r-- | include/llvm/Support/Memory.h | 3 | ||||
-rw-r--r-- | include/llvm/Support/MemoryBuffer.h | 3 | ||||
-rw-r--r-- | include/llvm/Support/Process.h | 2 | ||||
-rw-r--r-- | include/llvm/Support/Program.h | 3 | ||||
-rw-r--r-- | include/llvm/Support/YAMLTraits.h | 2 | ||||
-rw-r--r-- | include/llvm/Support/system_error.h | 23 |
13 files changed, 21 insertions, 38 deletions
diff --git a/include/llvm/IR/GVMaterializer.h b/include/llvm/IR/GVMaterializer.h index dbe52bc2a3..229048a3ba 100644 --- a/include/llvm/IR/GVMaterializer.h +++ b/include/llvm/IR/GVMaterializer.h @@ -18,10 +18,10 @@ #ifndef LLVM_IR_GVMATERIALIZER_H #define LLVM_IR_GVMATERIALIZER_H -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { - +using std::error_code; class Function; class GlobalValue; class Module; diff --git a/include/llvm/IR/Module.h b/include/llvm/IR/Module.h index 0c309e89c9..7e99158873 100644 --- a/include/llvm/IR/Module.h +++ b/include/llvm/IR/Module.h @@ -23,7 +23,7 @@ #include "llvm/IR/Metadata.h" #include "llvm/Support/CBindingWrapping.h" #include "llvm/Support/DataTypes.h" -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { diff --git a/include/llvm/Object/Error.h b/include/llvm/Object/Error.h index 3db9fa45e3..4d969393db 100644 --- a/include/llvm/Object/Error.h +++ b/include/llvm/Object/Error.h @@ -14,9 +14,10 @@ #ifndef LLVM_OBJECT_ERROR_H #define LLVM_OBJECT_ERROR_H -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { +using std::error_code; namespace object { const std::error_category &object_category(); diff --git a/include/llvm/ProfileData/InstrProf.h b/include/llvm/ProfileData/InstrProf.h index b44b92ef62..a3413d7008 100644 --- a/include/llvm/ProfileData/InstrProf.h +++ b/include/llvm/ProfileData/InstrProf.h @@ -16,10 +16,10 @@ #ifndef LLVM_PROFILEDATA_INSTRPROF_H_ #define LLVM_PROFILEDATA_INSTRPROF_H_ -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { - +using std::error_code; const std::error_category &instrprof_category(); enum class instrprof_error { diff --git a/include/llvm/Support/ErrorOr.h b/include/llvm/Support/ErrorOr.h index c59f86f1b9..8664ced657 100644 --- a/include/llvm/Support/ErrorOr.h +++ b/include/llvm/Support/ErrorOr.h @@ -18,11 +18,12 @@ #include "llvm/ADT/PointerIntPair.h" #include "llvm/Support/AlignOf.h" -#include "llvm/Support/system_error.h" #include <cassert> +#include <system_error> #include <type_traits> namespace llvm { +using std::error_code; template<class T, class V> typename std::enable_if< std::is_constructible<T, V>::value , typename std::remove_reference<V>::type>::type && diff --git a/include/llvm/Support/FileSystem.h b/include/llvm/Support/FileSystem.h index b5dcc665c7..678a3c19ca 100644 --- a/include/llvm/Support/FileSystem.h +++ b/include/llvm/Support/FileSystem.h @@ -33,11 +33,11 @@ #include "llvm/Support/DataTypes.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/TimeValue.h" -#include "llvm/Support/system_error.h" #include <ctime> #include <iterator> #include <stack> #include <string> +#include <system_error> #include <tuple> #include <vector> @@ -46,6 +46,7 @@ #endif namespace llvm { +using std::error_code; namespace sys { namespace fs { diff --git a/include/llvm/Support/LockFileManager.h b/include/llvm/Support/LockFileManager.h index 523a781b87..dca28fa878 100644 --- a/include/llvm/Support/LockFileManager.h +++ b/include/llvm/Support/LockFileManager.h @@ -12,11 +12,11 @@ #include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringRef.h" -#include "llvm/Support/system_error.h" +#include <system_error> #include <utility> // for std::pair namespace llvm { - +using std::error_code; /// \brief Class that manages the creation of a lock file to aid /// implicit coordination between different processes. /// diff --git a/include/llvm/Support/Memory.h b/include/llvm/Support/Memory.h index 0996adb23f..acd7a04080 100644 --- a/include/llvm/Support/Memory.h +++ b/include/llvm/Support/Memory.h @@ -15,10 +15,11 @@ #define LLVM_SUPPORT_MEMORY_H #include "llvm/Support/DataTypes.h" -#include "llvm/Support/system_error.h" #include <string> +#include <system_error> namespace llvm { +using std::error_code; namespace sys { /// This class encapsulates the notion of a memory block which has an address diff --git a/include/llvm/Support/MemoryBuffer.h b/include/llvm/Support/MemoryBuffer.h index ddb1a992d1..6d6a5da180 100644 --- a/include/llvm/Support/MemoryBuffer.h +++ b/include/llvm/Support/MemoryBuffer.h @@ -19,10 +19,11 @@ #include "llvm/Support/CBindingWrapping.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/DataTypes.h" -#include "llvm/Support/system_error.h" #include <memory> +#include <system_error> namespace llvm { +using std::error_code; /// MemoryBuffer - This interface provides simple read-only access to a block /// of memory, and provides simple methods for reading files and standard input /// into a memory buffer. In addition to basic access to the characters in the diff --git a/include/llvm/Support/Process.h b/include/llvm/Support/Process.h index 7f6441ea20..3ca3372afd 100644 --- a/include/llvm/Support/Process.h +++ b/include/llvm/Support/Process.h @@ -31,7 +31,7 @@ #include "llvm/Support/Allocator.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/TimeValue.h" -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { class StringRef; diff --git a/include/llvm/Support/Program.h b/include/llvm/Support/Program.h index 4cf90ab732..c1269508e0 100644 --- a/include/llvm/Support/Program.h +++ b/include/llvm/Support/Program.h @@ -16,9 +16,10 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/Support/Path.h" -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { +using std::error_code; namespace sys { /// This is the OS-specific separator for PATH like environment variables: diff --git a/include/llvm/Support/YAMLTraits.h b/include/llvm/Support/YAMLTraits.h index b69169bc79..a23faf65bb 100644 --- a/include/llvm/Support/YAMLTraits.h +++ b/include/llvm/Support/YAMLTraits.h @@ -24,7 +24,7 @@ #include "llvm/Support/SourceMgr.h" #include "llvm/Support/YAMLParser.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/system_error.h" +#include <system_error> namespace llvm { namespace yaml { diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h deleted file mode 100644 index 1b48ba935e..0000000000 --- a/include/llvm/Support/system_error.h +++ /dev/null @@ -1,23 +0,0 @@ -//===---------------------------- system_error ------------------*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This is a temporary file to help with the transition to std::error_code. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_SUPPORT_SYSTEM_ERROR_H -#define LLVM_SUPPORT_SYSTEM_ERROR_H - -#include <system_error> - -namespace llvm { -using std::error_code; -} - -#endif |