From 0cac4ca3916ac24ab6139d03cbfd18db9e715bfe Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 25 Nov 2014 21:00:58 +0000
Subject: Import LLDB as of upstream SVN r216948 (git 50f7fe44)

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

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

(limited to 'source/Interpreter/OptionValueFileSpec.cpp')

diff --git a/source/Interpreter/OptionValueFileSpec.cpp b/source/Interpreter/OptionValueFileSpec.cpp
index 3d2a7ff3307a..c8aaadef23bc 100644
--- a/source/Interpreter/OptionValueFileSpec.cpp
+++ b/source/Interpreter/OptionValueFileSpec.cpp
@@ -99,6 +99,7 @@ OptionValueFileSpec::SetValueFromCString (const char *value_cstr,
 
             m_value_was_set = true;
             m_current_value.SetFile(filepath.c_str(), true);
+            m_data_sp.reset();
         }
         else
         {
@@ -139,7 +140,7 @@ OptionValueFileSpec::AutoComplete (CommandInterpreter &interpreter,
                                                          s,
                                                          match_start_point,
                                                          max_return_elements,
-                                                         NULL,
+                                                         nullptr,
                                                          word_complete,
                                                          matches);
     return matches.GetSize();
-- 
cgit v1.2.3