diff options
Diffstat (limited to 'lldb/source/Core/PluginManager.cpp')
| -rw-r--r-- | lldb/source/Core/PluginManager.cpp | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/lldb/source/Core/PluginManager.cpp b/lldb/source/Core/PluginManager.cpp index 9131cac20ab..bd4ba599520 100644 --- a/lldb/source/Core/PluginManager.cpp +++ b/lldb/source/Core/PluginManager.cpp @@ -9,24 +9,35 @@ #include "lldb/Core/PluginManager.h" -// C Includes -// C++ Includes -#include <climits> -#include <mutex> -#include <string> -#include <vector> - -// Other libraries and framework includes -#include "llvm/ADT/StringRef.h" -#include "llvm/Support/DynamicLibrary.h" - -// Project includes #include "lldb/Core/Debugger.h" -#include "lldb/Host/Host.h" #include "lldb/Host/HostInfo.h" #include "lldb/Interpreter/OptionValueProperties.h" +#include "lldb/Utility/ConstString.h" // for ConstString #include "lldb/Utility/Error.h" #include "lldb/Utility/FileSpec.h" +#include "lldb/Utility/StringList.h" // for StringList + +#if defined(LLVM_ON_WIN32) +#include "lldb/Host/windows/PosixApi.h" // for PATH_MAX +#endif + +#include "llvm/ADT/StringRef.h" +#include "llvm/Support/DynamicLibrary.h" +#include "llvm/Support/FileSystem.h" // for file_type, file_... +#include "llvm/Support/raw_ostream.h" // for fs + +#include <map> // for map<>::const_ite... +#include <memory> // for shared_ptr +#include <mutex> +#include <string> +#include <utility> // for pair +#include <vector> + +#include <assert.h> // for assert + +namespace lldb_private { +class CommandInterpreter; +} using namespace lldb; using namespace lldb_private; @@ -2315,7 +2326,8 @@ static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPlugins( OptionValuePropertiesSP plugin_properties_sp = parent_properties_sp->GetSubProperty(nullptr, g_property_name); if (!plugin_properties_sp && can_create) { - plugin_properties_sp.reset(new OptionValueProperties(g_property_name)); + plugin_properties_sp = + std::make_shared<OptionValueProperties>(g_property_name); parent_properties_sp->AppendProperty( g_property_name, ConstString("Settings specify to plugins."), true, plugin_properties_sp); @@ -2325,8 +2337,8 @@ static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPlugins( lldb::OptionValuePropertiesSP plugin_type_properties_sp = plugin_properties_sp->GetSubProperty(nullptr, plugin_type_name); if (!plugin_type_properties_sp && can_create) { - plugin_type_properties_sp.reset( - new OptionValueProperties(plugin_type_name)); + plugin_type_properties_sp = + std::make_shared<OptionValueProperties>(plugin_type_name); plugin_properties_sp->AppendProperty(plugin_type_name, plugin_type_desc, true, plugin_type_properties_sp); } @@ -2349,7 +2361,8 @@ static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPluginsOldStyle( OptionValuePropertiesSP plugin_properties_sp = parent_properties_sp->GetSubProperty(nullptr, plugin_type_name); if (!plugin_properties_sp && can_create) { - plugin_properties_sp.reset(new OptionValueProperties(plugin_type_name)); + plugin_properties_sp = + std::make_shared<OptionValueProperties>(plugin_type_name); parent_properties_sp->AppendProperty(plugin_type_name, plugin_type_desc, true, plugin_properties_sp); } @@ -2358,8 +2371,8 @@ static lldb::OptionValuePropertiesSP GetDebuggerPropertyForPluginsOldStyle( lldb::OptionValuePropertiesSP plugin_type_properties_sp = plugin_properties_sp->GetSubProperty(nullptr, g_property_name); if (!plugin_type_properties_sp && can_create) { - plugin_type_properties_sp.reset( - new OptionValueProperties(g_property_name)); + plugin_type_properties_sp = + std::make_shared<OptionValueProperties>(g_property_name); plugin_properties_sp->AppendProperty( g_property_name, ConstString("Settings specific to plugins"), true, plugin_type_properties_sp); |
