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/Interpreter/OptionValuePathMappings.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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

diff --git a/source/Interpreter/OptionValuePathMappings.cpp b/source/Interpreter/OptionValuePathMappings.cpp
index 88a0eb7d6a3be..56f2ecf4f5fe4 100644
--- a/source/Interpreter/OptionValuePathMappings.cpp
+++ b/source/Interpreter/OptionValuePathMappings.cpp
@@ -43,6 +43,7 @@ OptionValuePathMappings::SetValueFromCString (const char *value, VarSetOperation
     {
         case eVarSetOperationClear:
             Clear ();
+            NotifyValueChanged();
             break;
             
         case eVarSetOperationReplace:
@@ -64,6 +65,7 @@ OptionValuePathMappings::SetValueFromCString (const char *value, VarSetOperation
                         if (!m_path_mappings.Replace (a, b, idx, m_notify_changes))
                             m_path_mappings.Append(a, b, m_notify_changes);
                     }
+                    NotifyValueChanged();
                 }
             }
             else
@@ -97,6 +99,7 @@ OptionValuePathMappings::SetValueFromCString (const char *value, VarSetOperation
                     m_path_mappings.Append(a, b, m_notify_changes);
                     m_value_was_set = true;
                 }
+                NotifyValueChanged();
             }
             break;
             
@@ -121,6 +124,7 @@ OptionValuePathMappings::SetValueFromCString (const char *value, VarSetOperation
                         ConstString b(args.GetArgumentAtIndex(i+1));
                         m_path_mappings.Insert (a, b, idx, m_notify_changes);
                     }
+                    NotifyValueChanged();
                 }
             }
             else
@@ -156,6 +160,7 @@ OptionValuePathMappings::SetValueFromCString (const char *value, VarSetOperation
                             m_path_mappings.Remove (j, m_notify_changes);
                         }
                     }
+                    NotifyValueChanged();
                 }
                 else
                 {
@@ -173,9 +178,6 @@ OptionValuePathMappings::SetValueFromCString (const char *value, VarSetOperation
             break;
     }
     return error;
-
-    m_value_was_set = true;
-    return Error();
 }
 
 lldb::OptionValueSP
-- 
cgit v1.2.3