diff options
12 files changed, 14 insertions, 38 deletions
diff --git a/lldb/include/lldb/Core/Disassembler.h b/lldb/include/lldb/Core/Disassembler.h index c42074719b1..eaaac6968f6 100644 --- a/lldb/include/lldb/Core/Disassembler.h +++ b/lldb/include/lldb/Core/Disassembler.h @@ -12,6 +12,8 @@ // C Includes // C++ Includes +#include <map> +#include <set> #include <string> #include <vector> diff --git a/lldb/include/lldb/Core/StringList.h b/lldb/include/lldb/Core/StringList.h index 2cd974dea94..64cd37b39b9 100644 --- a/lldb/include/lldb/Core/StringList.h +++ b/lldb/include/lldb/Core/StringList.h @@ -49,8 +49,6 @@ public: void AppendList(StringList strings); - bool ReadFileLines(FileSpec &input_file); - size_t GetSize() const; void SetSize(size_t n) { m_strings.resize(n); } diff --git a/lldb/include/lldb/Host/FileCache.h b/lldb/include/lldb/Host/FileCache.h index 6976a72940d..833b2ffc467 100644 --- a/lldb/include/lldb/Host/FileCache.h +++ b/lldb/include/lldb/Host/FileCache.h @@ -9,6 +9,7 @@ #ifndef liblldb_Host_FileCache_h #define liblldb_Host_FileCache_h +#include <map> #include <stdint.h> #include "lldb/lldb-forward.h" diff --git a/lldb/include/lldb/Host/FileSpec.h b/lldb/include/lldb/Host/FileSpec.h index d8d8b7a4be6..4eaa22b8532 100644 --- a/lldb/include/lldb/Host/FileSpec.h +++ b/lldb/include/lldb/Host/FileSpec.h @@ -17,7 +17,6 @@ // Other libraries and framework includes // Project includes -#include "lldb/Core/STLUtils.h" #include "lldb/Host/PosixApi.h" #include "lldb/Utility/ConstString.h" #include "lldb/lldb-private.h" @@ -590,21 +589,6 @@ public: void SetIsResolved(bool is_resolved) { m_is_resolved = is_resolved; } //------------------------------------------------------------------ - /// Read the file into an array of strings, one per line. - /// - /// Opens and reads the file in this object into an array of strings, - /// one string per line of the file. Returns a boolean indicating - /// success or failure. - /// - /// @param[out] lines - /// The string array into which to read the file. - /// - /// @result - /// Returns the number of lines that were read from the file. - //------------------------------------------------------------------ - size_t ReadFileLines(STLStringArray &lines); - - //------------------------------------------------------------------ /// Resolves user name and links in \a path, and overwrites the input /// argument with the resolved path. /// diff --git a/lldb/source/Core/StringList.cpp b/lldb/source/Core/StringList.cpp index c51a6e3071a..f9b2ca897f6 100644 --- a/lldb/source/Core/StringList.cpp +++ b/lldb/source/Core/StringList.cpp @@ -65,10 +65,6 @@ void StringList::AppendList(StringList strings) { m_strings.push_back(strings.GetStringAtIndex(i)); } -bool StringList::ReadFileLines(FileSpec &input_file) { - return input_file.ReadFileLines(m_strings); -} - size_t StringList::GetSize() const { return m_strings.size(); } size_t StringList::GetMaxStringLength() const { diff --git a/lldb/source/Host/common/FileSpec.cpp b/lldb/source/Host/common/FileSpec.cpp index 413c77d1bc7..a7d74c23b84 100644 --- a/lldb/source/Host/common/FileSpec.cpp +++ b/lldb/source/Host/common/FileSpec.cpp @@ -906,21 +906,6 @@ DataBufferSP FileSpec::ReadFileContentsAsCString(Error *error_ptr) { return data_sp; } -size_t FileSpec::ReadFileLines(STLStringArray &lines) { - lines.clear(); - char path[PATH_MAX]; - if (GetPath(path, sizeof(path))) { - std::ifstream file_stream(path); - - if (file_stream) { - std::string line; - while (getline(file_stream, line)) - lines.push_back(line); - } - } - return lines.size(); -} - FileSpec::EnumerateDirectoryResult FileSpec::ForEachItemInDirectory(llvm::StringRef dir_path, DirectoryCallback const &callback) { diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h index 1e8333fb099..8e4be1d4a06 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h @@ -12,6 +12,9 @@ // C Includes // C++ Includes +#include <map> +#include <memory> + // Other libraries and framework includes // Project includes #include "lldb/Breakpoint/StoppointCallbackContext.h" diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h index a6c78612d6d..dfe6296f0e7 100644 --- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h +++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.h @@ -22,6 +22,8 @@ // C Includes // C++ Includes +#include <map> +#include <memory> #include <mutex> class ObjectContainerBSDArchive : public lldb_private::ObjectContainer { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h index a05a8886bb4..be4e18b12be 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h @@ -15,7 +15,7 @@ #include "DWARFDIE.h" #include "SymbolFileDWARF.h" -#include "lldb/lldb-private.h" +#include "lldb/Core/STLUtils.h" #include "lldb/lldb-private.h" typedef std::multimap<const char *, dw_offset_t, CStringCompareFunctionObject> diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h index 9654ee3d6da..6e7d3f38aa8 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h @@ -11,6 +11,7 @@ #define SymbolFileDWARF_DWARFDebugPubnamesSet_h_ #include "SymbolFileDWARF.h" +#include <map> #include <string> #include <vector> #if __cplusplus >= 201103L || defined(_MSC_VER) @@ -19,6 +20,8 @@ #include <ext/hash_map> #endif +#include "lldb/Core/STLUtils.h" + class DWARFDebugPubnamesSet { public: struct Header { diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h index 109da631d77..dcca4268b6e 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.h @@ -11,6 +11,7 @@ #define SymbolFileDWARF_SymbolFileDWARFDebugMap_h_ #include <bitset> +#include <map> #include <vector> #include "lldb/Core/RangeMap.h" diff --git a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h index 1945af9a337..d1887a707ea 100644 --- a/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h +++ b/lldb/source/Plugins/SymbolFile/Symtab/SymbolFileSymtab.h @@ -12,6 +12,7 @@ // C Includes // C++ Includes +#include <map> #include <vector> // Other libraries and framework includes |
