From 1f917f69ff07f09b6dbb670971f57f8efe718b84 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 14 Jul 2022 20:50:02 +0200 Subject: Vendor import of llvm-project main llvmorg-15-init-16436-g18a6ab5b8d1f. --- llvm/lib/Object/Error.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Object/Error.cpp') diff --git a/llvm/lib/Object/Error.cpp b/llvm/lib/Object/Error.cpp index 6d1e3f2a59d0..62cb51ca09e4 100644 --- a/llvm/lib/Object/Error.cpp +++ b/llvm/lib/Object/Error.cpp @@ -13,7 +13,6 @@ #include "llvm/Object/Error.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/ManagedStatic.h" using namespace llvm; using namespace object; @@ -75,10 +74,9 @@ void GenericBinaryError::log(raw_ostream &OS) const { OS << Msg; } -static ManagedStatic<_object_error_category> error_category; - const std::error_category &object::object_category() { - return *error_category; + static _object_error_category error_category; + return error_category; } llvm::Error llvm::object::isNotObjectErrorInvalidFileType(llvm::Error Err) { -- cgit v1.2.3