From 01ee1789d6aa7294e5966a97f8d29387f6f81699 Mon Sep 17 00:00:00 2001 From: emaste 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/Property.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/Interpreter/Property.cpp') diff --git a/source/Interpreter/Property.cpp b/source/Interpreter/Property.cpp index e5cf63a..4937626 100644 --- a/source/Interpreter/Property.cpp +++ b/source/Interpreter/Property.cpp @@ -56,7 +56,7 @@ Property::Property (const PropertyDefinition &definition) : // "definition.default_cstr_value" as a string value that represents the default // value. if (definition.default_cstr_value) - m_value_sp.reset (new OptionValueBoolean(Args::StringToBoolean (definition.default_cstr_value, false, NULL))); + m_value_sp.reset (new OptionValueBoolean(Args::StringToBoolean (definition.default_cstr_value, false, nullptr))); else m_value_sp.reset (new OptionValueBoolean(definition.default_uint_value != 0)); break; @@ -108,7 +108,7 @@ Property::Property (const PropertyDefinition &definition) : { Format new_format = eFormatInvalid; if (definition.default_cstr_value) - Args::StringToFormat (definition.default_cstr_value, new_format, NULL); + Args::StringToFormat (definition.default_cstr_value, new_format, nullptr); else new_format = (Format)definition.default_uint_value; m_value_sp.reset (new OptionValueFormat(new_format)); -- cgit v1.1