diff options
| author | Caroline Tice <ctice@apple.com> | 2010-09-16 19:05:55 +0000 |
|---|---|---|
| committer | Caroline Tice <ctice@apple.com> | 2010-09-16 19:05:55 +0000 |
| commit | 9e41c15d8484ec71b31bb791bac3d3b41719bf5f (patch) | |
| tree | 86927a8ccf1e6c5d95a7c166cc51bc1f798f570c /lldb/source/Core/UserSettingsController.cpp | |
| parent | 20154b3ed4d7214e96986e90612f5d009a3e6348 (diff) | |
| download | bcm5719-llvm-9e41c15d8484ec71b31bb791bac3d3b41719bf5f.tar.gz bcm5719-llvm-9e41c15d8484ec71b31bb791bac3d3b41719bf5f.zip | |
Fix issues with CreateInstanceName, a virtual function, being called
in an initializer.
llvm-svn: 114107
Diffstat (limited to 'lldb/source/Core/UserSettingsController.cpp')
| -rw-r--r-- | lldb/source/Core/UserSettingsController.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp index b97aa1d7ea7..4a604cac38b 100644 --- a/lldb/source/Core/UserSettingsController.cpp +++ b/lldb/source/Core/UserSettingsController.cpp @@ -2187,6 +2187,7 @@ InstanceSettings::InstanceSettings (UserSettingsController &owner, const char *i m_instance_name (instance_name) { if ((m_instance_name != InstanceSettings::GetDefaultName()) + && (m_instance_name != InstanceSettings::InvalidName()) && live_instance) m_owner.RegisterInstanceSettings (this); } @@ -2205,6 +2206,14 @@ InstanceSettings::GetDefaultName () return g_default_settings_name; } +const ConstString & +InstanceSettings::InvalidName () +{ + static const ConstString g_invalid_name ("Invalid instance name"); + + return g_invalid_name; +} + void InstanceSettings::ChangeInstanceName (const std::string &new_instance_name) { |
