[llvm] r210733 - Don't import error_category into the llvm namespace.
Rafael Espindola
rafael.espindola at gmail.com
Wed Jun 11 18:45:43 PDT 2014
Author: rafael
Date: Wed Jun 11 20:45:43 2014
New Revision: 210733
URL: http://llvm.org/viewvc/llvm-project?rev=210733&view=rev
Log:
Don't import error_category into the llvm namespace.
Modified:
llvm/trunk/include/llvm/Object/Error.h
llvm/trunk/include/llvm/ProfileData/InstrProf.h
llvm/trunk/include/llvm/Support/system_error.h
llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
llvm/trunk/lib/Object/Error.cpp
llvm/trunk/lib/ProfileData/InstrProf.cpp
llvm/trunk/tools/llvm-readobj/Error.cpp
llvm/trunk/tools/llvm-readobj/Error.h
llvm/trunk/tools/obj2yaml/Error.cpp
llvm/trunk/tools/obj2yaml/Error.h
Modified: llvm/trunk/include/llvm/Object/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/Error.h?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/Error.h (original)
+++ llvm/trunk/include/llvm/Object/Error.h Wed Jun 11 20:45:43 2014
@@ -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,
Modified: llvm/trunk/include/llvm/ProfileData/InstrProf.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ProfileData/InstrProf.h?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ProfileData/InstrProf.h (original)
+++ llvm/trunk/include/llvm/ProfileData/InstrProf.h Wed Jun 11 20:45:43 2014
@@ -20,7 +20,7 @@
namespace llvm {
-const error_category &instrprof_category();
+const std::error_category &instrprof_category();
enum class instrprof_error {
success = 0,
Modified: llvm/trunk/include/llvm/Support/system_error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/system_error.h?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/system_error.h (original)
+++ llvm/trunk/include/llvm/Support/system_error.h Wed Jun 11 20:45:43 2014
@@ -19,7 +19,6 @@
namespace llvm {
using std::error_code;
using std::generic_category;
-using std::error_category;
using std::make_error_code;
}
Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Wed Jun 11 20:45:43 2014
@@ -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
};
}
-const error_category &BitcodeReader::BitcodeErrorCategory() {
+const std::error_category &BitcodeReader::BitcodeErrorCategory() {
static BitcodeErrorCategoryType O;
return O;
}
Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.h Wed Jun 11 20:45:43 2014
@@ -193,7 +193,7 @@ class BitcodeReader : public GVMateriali
/// not need this flag.
bool UseRelativeIDs;
- static const error_category &BitcodeErrorCategory();
+ static const std::error_category &BitcodeErrorCategory();
public:
enum ErrorType {
Modified: llvm/trunk/lib/Object/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/Error.cpp?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/lib/Object/Error.cpp (original)
+++ llvm/trunk/lib/Object/Error.cpp Wed Jun 11 20:45:43 2014
@@ -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_co
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;
}
Modified: llvm/trunk/lib/ProfileData/InstrProf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ProfileData/InstrProf.cpp?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/lib/ProfileData/InstrProf.cpp (original)
+++ llvm/trunk/lib/ProfileData/InstrProf.cpp Wed Jun 11 20:45:43 2014
@@ -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 : publi
};
}
-const error_category &llvm::instrprof_category() {
+const std::error_category &llvm::instrprof_category() {
static InstrProfErrorCategoryType C;
return C;
}
Modified: llvm/trunk/tools/llvm-readobj/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/Error.cpp?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/Error.cpp (original)
+++ llvm/trunk/tools/llvm-readobj/Error.cpp Wed Jun 11 20:45:43 2014
@@ -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_c
}
namespace llvm {
-const error_category &readobj_category() {
+const std::error_category &readobj_category() {
static _readobj_error_category o;
return o;
}
Modified: llvm/trunk/tools/llvm-readobj/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-readobj/Error.h?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-readobj/Error.h (original)
+++ llvm/trunk/tools/llvm-readobj/Error.h Wed Jun 11 20:45:43 2014
@@ -18,7 +18,7 @@
namespace llvm {
-const error_category &readobj_category();
+const std::error_category &readobj_category();
enum class readobj_error {
success = 0,
Modified: llvm/trunk/tools/obj2yaml/Error.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/Error.cpp?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/Error.cpp (original)
+++ llvm/trunk/tools/obj2yaml/Error.cpp Wed Jun 11 20:45:43 2014
@@ -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_
}
namespace llvm {
-const error_category &obj2yaml_category() {
+ const std::error_category &obj2yaml_category() {
static _obj2yaml_error_category o;
return o;
}
Modified: llvm/trunk/tools/obj2yaml/Error.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/Error.h?rev=210733&r1=210732&r2=210733&view=diff
==============================================================================
--- llvm/trunk/tools/obj2yaml/Error.h (original)
+++ llvm/trunk/tools/obj2yaml/Error.h Wed Jun 11 20:45:43 2014
@@ -14,7 +14,7 @@
namespace llvm {
-const error_category &obj2yaml_category();
+const std::error_category &obj2yaml_category();
enum class obj2yaml_error {
success = 0,
More information about the llvm-commits
mailing list