From 205afe679855a4ce8149cdaa94d3f0868ce796dc Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Fri, 6 Feb 2015 21:38:51 +0000
Subject: Import LLDB as of upstream SVN r225923 (git 2b588ecd)

This corresponds with the branchpoint for the 3.6 release.
A number of files not required for the FreeBSD build have been removed.

Sponsored by:	DARPA, AFRL
---
 source/lldb-log.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source/lldb-log.cpp')

diff --git a/source/lldb-log.cpp b/source/lldb-log.cpp
index 4311c1ad084f5..463de137f6235 100644
--- a/source/lldb-log.cpp
+++ b/source/lldb-log.cpp
@@ -11,6 +11,7 @@
 
 // C Includes
 // C++ Includes
+#include <atomic>
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Interpreter/Args.h"
@@ -27,7 +28,7 @@ using namespace lldb_private;
 // that will construct the static g_lob_sp the first time this function is 
 // called.
 
-static bool g_log_enabled = false;
+static std::atomic<bool> g_log_enabled {false};
 static Log * g_log = NULL;
 static Log *
 GetLog ()
-- 
cgit v1.2.3