replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't import error_category into the llvm namespace. 

llvm-svn: 210733
This commit is contained in:
Rafael Espindola 2014-06-12 01:45:43 +00:00
parent 92d8b456d9
commit 25188c95de
11 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/include/llvm/Object/Error.h
View File

@ -19,7 +19,7 @@
namespace llvm {
namespace object {
const error_category &object_category();
const std::error_category &object_category();
enum class object_error {
success = 0,

2
llvm/include/llvm/ProfileData/InstrProf.h
View File

@ -20,7 +20,7 @@
namespace llvm {
const error_category &instrprof_category();
const std::error_category &instrprof_category();
enum class instrprof_error {
success = 0,

1
llvm/include/llvm/Support/system_error.h
View File

@ -19,7 +19,6 @@
namespace llvm {
using std::error_code;
using std::generic_category;
using std::error_category;
using std::make_error_code;
}

4
llvm/lib/Bitcode/Reader/BitcodeReader.cpp
View File

@ -3300,7 +3300,7 @@ error_code BitcodeReader::InitLazyStream() {
}
namespace {
class BitcodeErrorCategoryType : public error_category {
class BitcodeErrorCategoryType : public std::error_category {
const char *name() const LLVM_NOEXCEPT override {
return "llvm.bitcode";
}
@ -3351,7 +3351,7 @@ class BitcodeErrorCategoryType : public error_category {
};
}
const error_category &BitcodeReader::BitcodeErrorCategory() {
const std::error_category &BitcodeReader::BitcodeErrorCategory() {
static BitcodeErrorCategoryType O;
return O;
}

2
llvm/lib/Bitcode/Reader/BitcodeReader.h
View File

@ -193,7 +193,7 @@ class BitcodeReader : public GVMaterializer {
/// not need this flag.
bool UseRelativeIDs;
static const error_category &BitcodeErrorCategory();
static const std::error_category &BitcodeErrorCategory();
public:
enum ErrorType {

4
llvm/lib/Object/Error.cpp
View File

@ -18,7 +18,7 @@ using namespace llvm;
using namespace object;
namespace {
class _object_error_category : public error_category {
class _object_error_category : public std::error_category {
public:
const char* name() const LLVM_NOEXCEPT override;
std::string message(int ev) const override;
@ -55,7 +55,7 @@ _object_error_category::default_error_condition(int EV) const {
return std::errc::invalid_argument;
}
const error_category &object::object_category() {
const std::error_category &object::object_category() {
static _object_error_category o;
return o;
}

4
llvm/lib/ProfileData/InstrProf.cpp
View File

@ -18,7 +18,7 @@
using namespace llvm;
namespace {
class InstrProfErrorCategoryType : public error_category {
class InstrProfErrorCategoryType : public std::error_category {
const char *name() const LLVM_NOEXCEPT override { return "llvm.instrprof"; }
std::string message(int IE) const override {
instrprof_error E = static_cast<instrprof_error>(IE);
@ -61,7 +61,7 @@ class InstrProfErrorCategoryType : public error_category {
};
}
const error_category &llvm::instrprof_category() {
const std::error_category &llvm::instrprof_category() {
static InstrProfErrorCategoryType C;
return C;
}

4
llvm/tools/llvm-readobj/Error.cpp
View File

@ -17,7 +17,7 @@
using namespace llvm;
namespace {
class _readobj_error_category : public error_category {
class _readobj_error_category : public std::error_category {
public:
const char* name() const LLVM_NOEXCEPT override;
std::string message(int ev) const override;
@ -56,7 +56,7 @@ _readobj_error_category::default_error_condition(int EV) const {
}
namespace llvm {
const error_category &readobj_category() {
const std::error_category &readobj_category() {
static _readobj_error_category o;
return o;
}

2
llvm/tools/llvm-readobj/Error.h
View File

@ -18,7 +18,7 @@
namespace llvm {
const error_category &readobj_category();
const std::error_category &readobj_category();
enum class readobj_error {
success = 0,

4
llvm/tools/obj2yaml/Error.cpp
View File

@ -13,7 +13,7 @@
using namespace llvm;
namespace {
class _obj2yaml_error_category : public error_category {
class _obj2yaml_error_category : public std::error_category {
public:
const char *name() const LLVM_NOEXCEPT override;
std::string message(int ev) const override;
@ -47,7 +47,7 @@ _obj2yaml_error_category::default_error_condition(int ev) const {
}
namespace llvm {
const error_category &obj2yaml_category() {
const std::error_category &obj2yaml_category() {
static _obj2yaml_error_category o;
return o;
}

2
llvm/tools/obj2yaml/Error.h
View File

@ -14,7 +14,7 @@
namespace llvm {
const error_category &obj2yaml_category();
const std::error_category &obj2yaml_category();
enum class obj2yaml_error {
success = 0,