Skip to content

Commit 3ba13de

Browse files
authored
Merge pull request #124 from Teemperor/RevertAllOnceFlagChanges2
[upstreaming] Revert all changes from llvm::once_flag to std::once_flag
2 parents 12f1c52 + d50e892 commit 3ba13de

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

lldb/source/Host/common/Editline.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ Editline::Editline(const char *editline_name, FILE *input_file,
11971197
if (term_fd != -1) {
11981198
static std::mutex *g_init_terminal_fds_mutex_ptr = nullptr;
11991199
static std::set<int> *g_init_terminal_fds_ptr = nullptr;
1200-
static std::once_flag g_once_flag;
1200+
static llvm::once_flag g_once_flag;
12011201
llvm::call_once(g_once_flag, [&]() {
12021202
g_init_terminal_fds_mutex_ptr =
12031203
new std::mutex(); // NOTE: Leak to avoid C++ destructor chain issues

lldb/source/Plugins/Language/ObjC/ObjCLanguage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ static void LoadCoreMediaFormatters(TypeCategoryImplSP objc_category_sp) {
863863
}
864864

865865
lldb::TypeCategoryImplSP ObjCLanguage::GetFormatters() {
866-
static std::once_flag g_initialize;
866+
static llvm::once_flag g_initialize;
867867
static TypeCategoryImplSP g_category;
868868

869869
llvm::call_once(g_initialize, [this]() -> void {

lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3593,7 +3593,7 @@ void ProcessGDBRemote::KillDebugserverProcess() {
35933593
}
35943594

35953595
void ProcessGDBRemote::Initialize() {
3596-
static std::once_flag g_once_flag;
3596+
static llvm::once_flag g_once_flag;
35973597

35983598
llvm::call_once(g_once_flag, []() {
35993599
PluginManager::RegisterPlugin(GetPluginNameStatic(),

lldb/source/Plugins/ScriptInterpreter/None/ScriptInterpreterNone.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void ScriptInterpreterNone::ExecuteInterpreterLoop() {
3939
}
4040

4141
void ScriptInterpreterNone::Initialize() {
42-
static std::once_flag g_once_flag;
42+
static llvm::once_flag g_once_flag;
4343

4444
llvm::call_once(g_once_flag, []() {
4545
PluginManager::RegisterPlugin(GetPluginNameStatic(),

0 commit comments

Comments
 (0)