maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Converting object's error_category to a ManagedStatic to avoid static constructors and destructors. 

llvm-svn: 218160
This commit is contained in:
Chris Bieneman 2014-09-19 22:09:18 +00:00
parent c4fb8ca7aa
commit 684981e454
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@
#include "llvm/Object/Error.h" #include "llvm/Object/Error.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/ManagedStatic.h"
using namespace llvm; using namespace llvm;
using namespace object; using namespace object;
@ -48,7 +49,8 @@ std::string _object_error_category::message(int EV) const {
"defined."); "defined.");
} }
static ManagedStatic<_object_error_category> error_category;
const std::error_category &object::object_category() { const std::error_category &object::object_category() {
static _object_error_category o; return *error_category;
return o;
} }