diff options
66 files changed, 350 insertions, 215 deletions
diff --git a/lldb/include/lldb/Core/ArchSpec.h b/lldb/include/lldb/Core/ArchSpec.h index e4d61748d4d..cdaee0e7a4e 100644 --- a/lldb/include/lldb/Core/ArchSpec.h +++ b/lldb/include/lldb/Core/ArchSpec.h @@ -13,7 +13,9 @@ #if defined(__cplusplus) #include "lldb/Utility/ConstString.h" +#include "lldb/lldb-enumerations.h" #include "lldb/lldb-forward.h" +#include "lldb/lldb-private-enumerations.h" #include "llvm/ADT/Triple.h" namespace lldb_private { diff --git a/lldb/include/lldb/Host/Symbols.h b/lldb/include/lldb/Host/Symbols.h index b97566a4caa..5f8632d221f 100644 --- a/lldb/include/lldb/Host/Symbols.h +++ b/lldb/include/lldb/Host/Symbols.h @@ -20,6 +20,10 @@ namespace lldb_private { +class ArchSpec; +class ModuleSpec; +class UUID; + class Symbols { public: //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Symbol/DeclVendor.h b/lldb/include/lldb/Symbol/DeclVendor.h index 5ee8b19b6ed..16d514fdf1b 100644 --- a/lldb/include/lldb/Symbol/DeclVendor.h +++ b/lldb/include/lldb/Symbol/DeclVendor.h @@ -11,6 +11,7 @@ #define liblldb_DeclVendor_h_ #include "lldb/Core/ClangForward.h" +#include "lldb/lldb-defines.h" #include <vector> diff --git a/lldb/include/lldb/Utility/Baton.h b/lldb/include/lldb/Utility/Baton.h index c2ab9f74907..065f2960962 100644 --- a/lldb/include/lldb/Utility/Baton.h +++ b/lldb/include/lldb/Utility/Baton.h @@ -10,12 +10,15 @@ #ifndef lldb_Baton_h_ #define lldb_Baton_h_ -// C Includes -// C++ Includes -// Other libraries and framework includes -// Project includes +#include "lldb/lldb-enumerations.h" // for DescriptionLevel #include "lldb/lldb-public.h" +#include <memory> // for unique_ptr + +namespace lldb_private { +class Stream; +} + namespace lldb_private { //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Utility/ConstString.h b/lldb/include/lldb/Utility/ConstString.h index eefe1c295e5..fbf1a9bf536 100644 --- a/lldb/include/lldb/Utility/ConstString.h +++ b/lldb/include/lldb/Utility/ConstString.h @@ -10,13 +10,17 @@ #ifndef liblldb_ConstString_h_ #define liblldb_ConstString_h_ -// C Includes -// C++ Includes -// Other libraries and framework includes #include "llvm/ADT/StringRef.h" +#include "llvm/Support/FormatVariadic.h" // for format_provider -// Project includes -#include "lldb/lldb-private.h" +#include <stddef.h> // for size_t + +namespace lldb_private { +class Stream; +} +namespace llvm { +class raw_ostream; +} namespace lldb_private { diff --git a/lldb/include/lldb/Utility/DataBufferHeap.h b/lldb/include/lldb/Utility/DataBufferHeap.h index 0a205b931a7..20e27ef8950 100644 --- a/lldb/include/lldb/Utility/DataBufferHeap.h +++ b/lldb/include/lldb/Utility/DataBufferHeap.h @@ -10,10 +10,12 @@ #ifndef liblldb_DataBufferHeap_h_ #define liblldb_DataBufferHeap_h_ -#include <vector> - #include "lldb/Utility/DataBuffer.h" -#include "lldb/lldb-private.h" +#include "lldb/lldb-types.h" // for offset_t +#include "llvm/ADT/StringRef.h" // for StringRef + +#include <cstdint> // for uint8_t, uint64_t +#include <vector> namespace lldb_private { diff --git a/lldb/include/lldb/Utility/DataBufferLLVM.h b/lldb/include/lldb/Utility/DataBufferLLVM.h index fb6cd26f6ad..737e2d01904 100644 --- a/lldb/include/lldb/Utility/DataBufferLLVM.h +++ b/lldb/include/lldb/Utility/DataBufferLLVM.h @@ -11,8 +11,10 @@ #define LLDB_CORE_DATABUFFERLLVM_H #include "lldb/Utility/DataBuffer.h" +#include "lldb/lldb-types.h" // for offset_t #include <memory> +#include <stdint.h> // for uint8_t, uint64_t namespace llvm { class MemoryBuffer; diff --git a/lldb/include/lldb/Utility/DataEncoder.h b/lldb/include/lldb/Utility/DataEncoder.h index 054c7248590..ea347d86237 100644 --- a/lldb/include/lldb/Utility/DataEncoder.h +++ b/lldb/include/lldb/Utility/DataEncoder.h @@ -12,8 +12,12 @@ #if defined(__cplusplus) -#include "lldb/lldb-private.h" -#include <limits.h> +#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN +#include "lldb/lldb-enumerations.h" // for ByteOrder +#include "lldb/lldb-forward.h" // for DataBufferSP +#include "lldb/lldb-types.h" // for addr_t + +#include <stddef.h> // for size_t #include <stdint.h> namespace lldb_private { diff --git a/lldb/include/lldb/Utility/DataExtractor.h b/lldb/include/lldb/Utility/DataExtractor.h index 587f5008355..58240d9a526 100644 --- a/lldb/include/lldb/Utility/DataExtractor.h +++ b/lldb/include/lldb/Utility/DataExtractor.h @@ -10,16 +10,24 @@ #ifndef LLDB_UTILITY_DATAEXTRACTOR_H #define LLDB_UTILITY_DATAEXTRACTOR_H -// Other libraries and framework includes #include "lldb/lldb-defines.h" +#include "lldb/lldb-enumerations.h" // for ByteOrder +#include "lldb/lldb-forward.h" // for DataBufferSP #include "lldb/lldb-types.h" -#include "llvm/ADT/SmallVector.h" -// C Includes -#include <limits.h> #include <stdint.h> #include <string.h> +namespace lldb_private { +class Log; +} +namespace lldb_private { +class Stream; +} +namespace llvm { +template <typename T> class SmallVectorImpl; +} + // C++ Includes namespace lldb_private { diff --git a/lldb/include/lldb/Utility/Error.h b/lldb/include/lldb/Utility/Error.h index 987b24c4e99..a236ab45a0b 100644 --- a/lldb/include/lldb/Utility/Error.h +++ b/lldb/include/lldb/Utility/Error.h @@ -11,17 +11,21 @@ #define __DCError_h__ #if defined(__cplusplus) -#include "llvm/Support/DataTypes.h" -#include "llvm/Support/FormatAdapters.h" +#include "lldb/lldb-defines.h" +#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType... +#include "llvm/ADT/StringRef.h" // for StringRef #include "llvm/Support/FormatVariadic.h" #include <cstdarg> -#include <cstdio> #include <string> +#include <system_error> // for error_code +#include <type_traits> // for forward -#include "lldb/lldb-private.h" +#include <stdint.h> // for uint32_t -#include "llvm/Support/FormatVariadic.h" +namespace llvm { +class raw_ostream; +} namespace lldb_private { diff --git a/lldb/include/lldb/Utility/FileSpec.h b/lldb/include/lldb/Utility/FileSpec.h index dd6b28a3995..67926d01e52 100644 --- a/lldb/include/lldb/Utility/FileSpec.h +++ b/lldb/include/lldb/Utility/FileSpec.h @@ -18,12 +18,27 @@ // Other libraries and framework includes // Project includes #include "lldb/Utility/ConstString.h" -#include "lldb/lldb-private.h" -#include "llvm/ADT/Triple.h" +#include "llvm/ADT/StringRef.h" // for StringRef #include "llvm/Support/FileSystem.h" #include "llvm/Support/FormatVariadic.h" +#include <stddef.h> // for size_t +#include <stdint.h> // for uint32_t, uint64_t + +namespace lldb_private { +class Stream; +} +namespace llvm { +class Triple; +} +namespace llvm { +class raw_ostream; +} +namespace llvm { +template <typename T> class SmallVectorImpl; +} + namespace lldb_private { //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Utility/History.h b/lldb/include/lldb/Utility/History.h index fcffcdd901b..c6882b65fd8 100644 --- a/lldb/include/lldb/Utility/History.h +++ b/lldb/include/lldb/Utility/History.h @@ -10,17 +10,19 @@ #ifndef lldb_History_h_ #define lldb_History_h_ -// C Includes -#include <stdint.h> +#include "lldb/lldb-defines.h" // for DISALLOW_COPY_AND_ASSIGN // C++ Includes #include <mutex> #include <stack> #include <string> -// Other libraries and framework includes -// Project includes -#include "lldb/lldb-public.h" +#include <stddef.h> // for size_t +#include <stdint.h> + +namespace lldb_private { +class Stream; +} namespace lldb_private { diff --git a/lldb/include/lldb/Utility/JSON.h b/lldb/include/lldb/Utility/JSON.h index 360a9fb5e0a..5c5d382048c 100644 --- a/lldb/include/lldb/Utility/JSON.h +++ b/lldb/include/lldb/Utility/JSON.h @@ -10,19 +10,20 @@ #ifndef utility_JSON_h_ #define utility_JSON_h_ -#include "lldb/Utility/Stream.h" #include "lldb/Utility/StringExtractor.h" -#include <inttypes.h> #include <map> #include <memory> -#include <stdint.h> #include <string> +#include <type_traits> #include <vector> -#include "llvm/Support/Casting.h" +#include <stdint.h> namespace lldb_private { +class Stream; +} +namespace lldb_private { class JSONValue { public: diff --git a/lldb/include/lldb/Utility/LLDBAssert.h b/lldb/include/lldb/Utility/LLDBAssert.h index 328a4d4f925..9d9f3ceefab 100644 --- a/lldb/include/lldb/Utility/LLDBAssert.h +++ b/lldb/include/lldb/Utility/LLDBAssert.h @@ -1,5 +1,4 @@ -//===----------------- LLDBAssert.h --------------------------------*- C++ -//-*-===// +//===----------------- LLDBAssert.h ------------------------------*- C++-*-===// // // The LLVM Compiler Infrastructure // @@ -11,8 +10,6 @@ #ifndef utility_LLDBAssert_h_ #define utility_LLDBAssert_h_ -#include <assert.h> - #ifdef LLDB_CONFIGURATION_DEBUG #define lldbassert(x) assert(x) #else diff --git a/lldb/include/lldb/Utility/Log.h b/lldb/include/lldb/Utility/Log.h index e74c2e76aee..bfc0f4c9590 100644 --- a/lldb/include/lldb/Utility/Log.h +++ b/lldb/include/lldb/Utility/Log.h @@ -10,22 +10,29 @@ #ifndef LLDB_UTILITY_LOG_H #define LLDB_UTILITY_LOG_H -// Project includes #include "lldb/Utility/Flags.h" #include "lldb/Utility/Logging.h" #include "lldb/lldb-defines.h" -// Other libraries and framework includes #include "llvm/ADT/ArrayRef.h" +#include "llvm/ADT/StringMap.h" // for StringMap +#include "llvm/ADT/StringRef.h" // for StringRef, StringLiteral #include "llvm/Support/FormatVariadic.h" -#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/RWMutex.h" -// C++ Includes + #include <atomic> #include <cstdarg> #include <cstdint> -// C Includes - +#include <memory> // for shared_ptr +#include <string> // for string +#include <type_traits> // for forward + +namespace llvm { +class raw_ostream; +} +namespace llvm { +template <class C> class ManagedStatic; +} //---------------------------------------------------------------------- // Logging Options //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Utility/Range.h b/lldb/include/lldb/Utility/Range.h index c13bc0d08bd..60880dbdbc8 100644 --- a/lldb/include/lldb/Utility/Range.h +++ b/lldb/include/lldb/Utility/Range.h @@ -10,7 +10,6 @@ #ifndef utility_Range_h_ #define utility_Range_h_ -#include <algorithm> #include <stdint.h> namespace lldb_utility { diff --git a/lldb/include/lldb/Utility/RegularExpression.h b/lldb/include/lldb/Utility/RegularExpression.h index bdb119e79ea..d97e3564758 100644 --- a/lldb/include/lldb/Utility/RegularExpression.h +++ b/lldb/include/lldb/Utility/RegularExpression.h @@ -36,11 +36,13 @@ inline void regfree(llvm_regex_t *a) { llvm_regfree(a); } #endif #include <regex.h> #endif -#include <stdint.h> #include <string> #include <vector> +#include <stddef.h> // for size_t +#include <stdint.h> + namespace llvm { class StringRef; } // namespace llvm diff --git a/lldb/include/lldb/Utility/SelectHelper.h b/lldb/include/lldb/Utility/SelectHelper.h index 0251c8e72cd..5fa856b15d9 100644 --- a/lldb/include/lldb/Utility/SelectHelper.h +++ b/lldb/include/lldb/Utility/SelectHelper.h @@ -10,16 +10,13 @@ #ifndef liblldb_SelectHelper_h_ #define liblldb_SelectHelper_h_ -// C Includes -// C++ Includes -#include <chrono> +#include "lldb/Utility/Error.h" // for Error +#include "lldb/lldb-types.h" // for socket_t -// Other libraries and framework includes #include "llvm/ADT/DenseMap.h" #include "llvm/ADT/Optional.h" -// Project includes -#include "lldb/lldb-forward.h" +#include <chrono> class SelectHelper { public: diff --git a/lldb/include/lldb/Utility/SharingPtr.h b/lldb/include/lldb/Utility/SharingPtr.h index 4e91222b3c3..49b0020da3e 100644 --- a/lldb/include/lldb/Utility/SharingPtr.h +++ b/lldb/include/lldb/Utility/SharingPtr.h @@ -12,7 +12,6 @@ // C Includes // C++ Includes -#include <algorithm> #include <memory> // Microsoft Visual C++ currently does not enable std::atomic to work @@ -24,6 +23,8 @@ #include <atomic> #endif +#include <stddef.h> + // Other libraries and framework includes // Project includes diff --git a/lldb/include/lldb/Utility/Stream.h b/lldb/include/lldb/Utility/Stream.h index 7b989f0da22..5a00f0a50ca 100644 --- a/lldb/include/lldb/Utility/Stream.h +++ b/lldb/include/lldb/Utility/Stream.h @@ -10,18 +10,17 @@ #ifndef liblldb_Stream_h_ #define liblldb_Stream_h_ -// C Includes -#include <stdarg.h> - -// C++ Includes -// Other libraries and framework includes -// Project includes #include "lldb/Utility/Flags.h" - -#include "lldb/lldb-private.h" - +#include "lldb/lldb-defines.h" +#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderInvalid +#include "llvm/ADT/StringRef.h" // for StringRef #include "llvm/Support/FormatVariadic.h" +#include <stdarg.h> +#include <stddef.h> // for size_t +#include <stdint.h> // for uint32_t, uint64_t, uint8_t +#include <type_traits> // for forward + namespace lldb_private { //---------------------------------------------------------------------- diff --git a/lldb/include/lldb/Utility/StreamCallback.h b/lldb/include/lldb/Utility/StreamCallback.h index 0556e46ea30..0aa9d5d57b2 100644 --- a/lldb/include/lldb/Utility/StreamCallback.h +++ b/lldb/include/lldb/Utility/StreamCallback.h @@ -12,7 +12,9 @@ #include "lldb/lldb-types.h" #include "llvm/Support/raw_ostream.h" -#include <string> + +#include <stddef.h> // for size_t +#include <stdint.h> // for uint64_t namespace lldb_private { diff --git a/lldb/include/lldb/Utility/StreamGDBRemote.h b/lldb/include/lldb/Utility/StreamGDBRemote.h index 14a41d796a1..79234cc03d8 100644 --- a/lldb/include/lldb/Utility/StreamGDBRemote.h +++ b/lldb/include/lldb/Utility/StreamGDBRemote.h @@ -1,5 +1,4 @@ -//===-- StreamGDBRemote.h ----------------------------------------*- C++ -//-*-===// +//===-- StreamGDBRemote.h ----------------------------------------*- C++-*-===// // // The LLVM Compiler Infrastructure // @@ -11,13 +10,11 @@ #ifndef liblldb_StreamGDBRemote_h_ #define liblldb_StreamGDBRemote_h_ -// C Includes -// C++ Includes +#include "lldb/Utility/StreamString.h" // for StreamString +#include "lldb/lldb-enumerations.h" // for ByteOrder -// Other libraries and framework includes -// Project includes - -#include "lldb/Utility/StreamString.h" +#include <stddef.h> // for size_t +#include <stdint.h> // for uint32_t namespace lldb_private { diff --git a/lldb/include/lldb/Utility/StreamString.h b/lldb/include/lldb/Utility/StreamString.h index e1b8ff75008..0ae3e82a349 100644 --- a/lldb/include/lldb/Utility/StreamString.h +++ b/lldb/include/lldb/Utility/StreamString.h @@ -10,9 +10,14 @@ #ifndef liblldb_StreamString_h_ #define liblldb_StreamString_h_ -#include <string> +#include "lldb/Utility/Stream.h" // for Stream +#include "lldb/lldb-enumerations.h" // for ByteOrder +#include "llvm/ADT/StringRef.h" // for StringRef -#include "lldb/Utility/Stream.h" +#include <string> // for string + +#include <stddef.h> // for size_t +#include <stdint.h> // for uint32_t namespace lldb_private { diff --git a/lldb/include/lldb/Utility/StringExtractor.h b/lldb/include/lldb/Utility/StringExtractor.h index 624d1ef3edf..40c1ef79cff 100644 --- a/lldb/include/lldb/Utility/StringExtractor.h +++ b/lldb/include/lldb/Utility/StringExtractor.h @@ -10,16 +10,15 @@ #ifndef utility_StringExtractor_h_ #define utility_StringExtractor_h_ -// C Includes -// C++ Includes -#include <stdint.h> -#include <string> - // Other libraries and framework includes // Project includes #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringRef.h" +#include <stddef.h> // for size_t +#include <stdint.h> +#include <string> + class StringExtractor { public: enum { BigEndian = 0, LittleEndian = 1 }; diff --git a/lldb/include/lldb/Utility/StringLexer.h b/lldb/include/lldb/Utility/StringLexer.h index 3a399dfd781..e2c31db329c 100644 --- a/lldb/include/lldb/Utility/StringLexer.h +++ b/lldb/include/lldb/Utility/StringLexer.h @@ -11,9 +11,9 @@ #ifndef utility_StringLexer_h_ #define utility_StringLexer_h_ -#include <initializer_list> -#include <list> -#include <string> +#include <initializer_list> // for initializer_list +#include <string> // for string +#include <utility> // for pair namespace lldb_utility { diff --git a/lldb/include/lldb/Utility/StringList.h b/lldb/include/lldb/Utility/StringList.h index 6f79bad9a19..2be9a6bd834 100644 --- a/lldb/include/lldb/Utility/StringList.h +++ b/lldb/include/lldb/Utility/StringList.h @@ -10,18 +10,18 @@ #ifndef liblldb_StringList_h_ #define liblldb_StringList_h_ -// C Includes -#include <stdint.h> +#include "llvm/ADT/StringRef.h" -// C++ Includes +#include <stddef.h> // for size_t #include <string> #include <vector> -// Other libraries and framework includes -#include "llvm/ADT/StringRef.h" - -// Project includes -#include "lldb/lldb-forward.h" +namespace lldb_private { +class Log; +} +namespace lldb_private { +class Stream; +} namespace lldb_private { diff --git a/lldb/include/lldb/Utility/TaskPool.h b/lldb/include/lldb/Utility/TaskPool.h index 3ad9c7cfe31..fb936bbb739 100644 --- a/lldb/include/lldb/Utility/TaskPool.h +++ b/lldb/include/lldb/Utility/TaskPool.h @@ -10,13 +10,12 @@ #ifndef utility_TaskPool_h_ #define utility_TaskPool_h_ -#include <cassert> -#include <cstdint> +#include <functional> // for bind, function #include <future> #include <list> -#include <queue> -#include <thread> -#include <vector> +#include <memory> // for make_shared +#include <mutex> // for mutex, unique_lock, condition_variable +#include <type_traits> // for forward, result_of, move // Global TaskPool class for running tasks in parallel on a set of worker thread // created the first diff --git a/lldb/include/lldb/Utility/TildeExpressionResolver.h b/lldb/include/lldb/Utility/TildeExpressionResolver.h index c0e1d2c1271..84620320c7a 100644 --- a/lldb/include/lldb/Utility/TildeExpressionResolver.h +++ b/lldb/include/lldb/Utility/TildeExpressionResolver.h @@ -10,10 +10,13 @@ #ifndef LLDB_UTILITY_TILDE_EXPRESSION_RESOLVER_H #define LLDB_UTILITY_TILDE_EXPRESSION_RESOLVER_H -#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" #include "llvm/ADT/StringSet.h" +namespace llvm { +template <typename T> class SmallVectorImpl; +} + namespace lldb_private { class TildeExpressionResolver { public: diff --git a/lldb/include/lldb/Utility/UUID.h b/lldb/include/lldb/Utility/UUID.h index 5be8795293c..28069bbe4c7 100644 --- a/lldb/include/lldb/Utility/UUID.h +++ b/lldb/include/lldb/Utility/UUID.h @@ -12,6 +12,7 @@ // C Includes // C++ Includes +#include <stddef.h> #include <stdint.h> #include <string> diff --git a/lldb/include/lldb/Utility/UserID.h b/lldb/include/lldb/Utility/UserID.h index 59644833455..b178efd44fe 100644 --- a/lldb/include/lldb/Utility/UserID.h +++ b/lldb/include/lldb/Utility/UserID.h @@ -10,7 +10,11 @@ #ifndef liblldb_UserID_h_ #define liblldb_UserID_h_ -#include "lldb/lldb-private.h" +#include "lldb/lldb-defines.h" // for LLDB_INVALID_UID +#include "lldb/lldb-types.h" // for user_id_t +namespace lldb_private { +class Stream; +} namespace lldb_private { diff --git a/lldb/include/lldb/Utility/VMRange.h b/lldb/include/lldb/Utility/VMRange.h index 4ec64c99755..98362f4d760 100644 --- a/lldb/include/lldb/Utility/VMRange.h +++ b/lldb/include/lldb/Utility/VMRange.h @@ -10,10 +10,17 @@ #ifndef liblldb_VMRange_h_ #define liblldb_VMRange_h_ -#include "lldb/lldb-private.h" +#include "lldb/lldb-types.h" // for addr_t + +#include <stddef.h> // for size_t +#include <stdint.h> // for uint32_t #include <vector> namespace lldb_private { +class Stream; +} + +namespace lldb_private { //---------------------------------------------------------------------- // A vm address range. These can represent offsets ranges or actual diff --git a/lldb/source/Host/common/Editline.cpp b/lldb/source/Host/common/Editline.cpp index ff6291fc963..b157cdb7c11 100644 --- a/lldb/source/Host/common/Editline.cpp +++ b/lldb/source/Host/common/Editline.cpp @@ -20,6 +20,7 @@ #include "lldb/Utility/SelectHelper.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/StringList.h" +#include "lldb/Utility/Timeout.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Threading.h" diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h b/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h index 12db366d7a5..74d5d6e5020 100644 --- a/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h +++ b/lldb/source/Plugins/Process/Utility/RegisterInfoInterface.h @@ -13,6 +13,7 @@ #include <vector> #include "lldb/Core/ArchSpec.h" +#include "lldb/lldb-private-types.h" namespace lldb_private { diff --git a/lldb/source/Utility/Baton.cpp b/lldb/source/Utility/Baton.cpp index 2f79eaf3de5..786be2fe998 100644 --- a/lldb/source/Utility/Baton.cpp +++ b/lldb/source/Utility/Baton.cpp @@ -9,14 +9,5 @@ #include "lldb/Utility/Baton.h" -// C Includes -// C++ Includes -// Other libraries and framework includes -// Project includes -#include "lldb/Utility/Stream.h" - -using namespace lldb; -using namespace lldb_private; - -void UntypedBaton::GetDescription(Stream *s, - lldb::DescriptionLevel level) const {} +void lldb_private::UntypedBaton::GetDescription( + Stream *s, lldb::DescriptionLevel level) const {} diff --git a/lldb/source/Utility/ConstString.cpp b/lldb/source/Utility/ConstString.cpp index f8e0075e390..8adeb6f364e 100644 --- a/lldb/source/Utility/ConstString.cpp +++ b/lldb/source/Utility/ConstString.cpp @@ -9,19 +9,23 @@ #include "lldb/Utility/ConstString.h" -// C Includes -// C++ Includes -#include <array> -#include <mutex> +#include "lldb/Utility/Stream.h" -// Other libraries and framework includes #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringMap.h" +#include "llvm/ADT/iterator.h" // for iterator_facade_base +#include "llvm/Support/Allocator.h" // for BumpPtrAllocator +#include "llvm/Support/FormatProviders.h" // for format_provider #include "llvm/Support/RWMutex.h" - -// Project includes #include "llvm/Support/Threading.h" -#include "lldb/Utility/Stream.h" + +#include <algorithm> // for min +#include <array> +#include <utility> // for make_pair, pair + +#include <inttypes.h> // for PRIu64 +#include <stdint.h> // for uint8_t, uint32_t, uint64_t +#include <string.h> // for size_t, strlen using namespace lldb_private; diff --git a/lldb/source/Utility/DataBufferLLVM.cpp b/lldb/source/Utility/DataBufferLLVM.cpp index cd1bb3a3328..bebcafbf915 100644 --- a/lldb/source/Utility/DataBufferLLVM.cpp +++ b/lldb/source/Utility/DataBufferLLVM.cpp @@ -13,6 +13,9 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/MemoryBuffer.h" +#include <assert.h> // for assert +#include <type_traits> // for move + using namespace lldb_private; DataBufferLLVM::DataBufferLLVM(std::unique_ptr<llvm::MemoryBuffer> MemBuffer) diff --git a/lldb/source/Utility/DataEncoder.cpp b/lldb/source/Utility/DataEncoder.cpp index f640f0daa2f..f7ce46889d2 100644 --- a/lldb/source/Utility/DataEncoder.cpp +++ b/lldb/source/Utility/DataEncoder.cpp @@ -12,13 +12,14 @@ #include "lldb/Utility/DataBuffer.h" #include "lldb/Utility/Endian.h" +#include "llvm/Support/ErrorHandling.h" // for llvm_unreachable #include "llvm/Support/MathExtras.h" -// C Includes -// C++ Includes #include <cassert> #include <cstddef> +#include <string.h> + using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Utility/DataExtractor.cpp b/lldb/source/Utility/DataExtractor.cpp index 5dc518beeaf..008aff22094 100644 --- a/lldb/source/Utility/DataExtractor.cpp +++ b/lldb/source/Utility/DataExtractor.cpp @@ -7,29 +7,36 @@ // //===----------------------------------------------------------------------===// -// C Includes -// C++ Includes -#include <cassert> -#include <cmath> -#include <cstddef> -#include <string> +#include "lldb/Utility/DataExtractor.h" + +#include "lldb/lldb-defines.h" // for LLDB_INVALID_ADDRESS +#include "lldb/lldb-enumerations.h" // for ByteOrder::eByteOrderBig +#include "lldb/lldb-forward.h" // for DataBufferSP +#include "lldb/lldb-types.h" // for offset_t -// Project includes #include "lldb/Utility/DataBuffer.h" #include "lldb/Utility/DataBufferHeap.h" -#include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/Endian.h" #include "lldb/Utility/Log.h" #include "lldb/Utility/Stream.h" #include "lldb/Utility/StreamString.h" #include "lldb/Utility/UUID.h" -// Other libraries and framework includes #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/MD5.h" #include "llvm/Support/MathExtras.h" +#include <algorithm> // for min +#include <array> // for array +#include <cassert> +#include <cstdint> // for uint8_t, uint32_t, uint64_t +#include <string> + +#include <ctype.h> // for isprint +#include <inttypes.h> // for PRIx64, PRId64 +#include <string.h> // for memcpy, memset, memchr + using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Utility/Error.cpp b/lldb/source/Utility/Error.cpp index 01f933141f0..b21ee57b61a 100644 --- a/lldb/source/Utility/Error.cpp +++ b/lldb/source/Utility/Error.cpp @@ -7,22 +7,30 @@ // //===----------------------------------------------------------------------===// -// C Includes -#ifdef __APPLE__ -#include <mach/mach.h> -#endif +#include "lldb/Utility/Error.h" + +#include "lldb/Utility/VASPrintf.h" +#include "lldb/lldb-defines.h" // for LLDB_GENERIC_ERROR +#include "lldb/lldb-enumerations.h" // for ErrorType, ErrorType::eErr... +#include "llvm/ADT/SmallString.h" // for SmallString +#include "llvm/ADT/StringRef.h" // for StringRef +#include "llvm/Support/FormatProviders.h" // for format_provider -// C++ Includes #include <cerrno> #include <cstdarg> +#include <string> // for string #include <system_error> -// Other libraries and framework includes -#include "llvm/ADT/SmallVector.h" +#ifdef __APPLE__ +#include <mach/mach.h> +#endif -// Project includes -#include "lldb/Utility/Error.h" -#include "lldb/Utility/VASPrintf.h" +#include <stdint.h> // for uint32_t +#include <string.h> // for strerror + +namespace llvm { +class raw_ostream; +} using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Utility/FastDemangle.cpp b/lldb/source/Utility/FastDemangle.cpp index c5324d4e3b9..90326c5f15c 100644 --- a/lldb/source/Utility/FastDemangle.cpp +++ b/lldb/source/Utility/FastDemangle.cpp @@ -7,14 +7,15 @@ // //===----------------------------------------------------------------------===// -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "lldb/Utility/FastDemangle.h" + +#include "llvm/Support/Compiler.h" // for LLVM_FALLTHROUGH #include <functional> -#include "lldb/Utility/FastDemangle.h" -#include "lldb/lldb-private.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> //#define DEBUG_FAILURES 1 //#define DEBUG_SUBSTITUTIONS 1 diff --git a/lldb/source/Utility/FileSpec.cpp b/lldb/source/Utility/FileSpec.cpp index c5fef0fdfc2..3c4e3407ddf 100644 --- a/lldb/source/Utility/FileSpec.cpp +++ b/lldb/source/Utility/FileSpec.cpp @@ -8,19 +8,29 @@ //===----------------------------------------------------------------------===// #include "lldb/Utility/FileSpec.h" -#include "lldb/Utility/CleanUp.h" #include "lldb/Utility/RegularExpression.h" #include "lldb/Utility/Stream.h" -#include "lldb/Utility/StreamString.h" -#include "lldb/Utility/StringList.h" #include "lldb/Utility/TildeExpressionResolver.h" -#include "llvm/ADT/StringExtras.h" +#include "llvm/ADT/SmallString.h" // for SmallString +#include "llvm/ADT/SmallVector.h" // for SmallVectorTemplat... #include "llvm/ADT/StringRef.h" -#include "llvm/Support/ConvertUTF.h" +#include "llvm/ADT/Triple.h" // for Triple +#include "llvm/ADT/Twine.h" // for Twine +#include "llvm/Config/llvm-config.h" // for LLVM_ON_WIN32 +#include "llvm/Support/ErrorOr.h" // for ErrorOr #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/Program.h" +#include "llvm/Support/raw_ostream.h" // for raw_ostream, fs + +#include <algorithm> // for replace, min, unique +#include <system_error> // for error_code +#include <vector> // for vector + +#include <assert.h> // for assert +#include <stdio.h> // for size_t, NULL, snpr... +#include <string.h> // for strcmp using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Utility/JSON.cpp b/lldb/source/Utility/JSON.cpp index ffcd72de113..d20d9e46fef 100644 --- a/lldb/source/Utility/JSON.cpp +++ b/lldb/source/Utility/JSON.cpp @@ -9,12 +9,15 @@ #include "lldb/Utility/JSON.h" -#include "llvm/ADT/APFloat.h" -#include "llvm/ADT/StringRef.h" - +#include "lldb/Utility/Stream.h" // for Stream #include "lldb/Utility/StreamString.h" +#include "llvm/ADT/StringRef.h" #include "llvm/Support/ErrorHandling.h" + +#include <inttypes.h> // for PRIu64, PRId64 #include <limits.h> +#include <stddef.h> // for size_t +#include <utility> // for pair using namespace lldb_private; diff --git a/lldb/source/Utility/LLDBAssert.cpp b/lldb/source/Utility/LLDBAssert.cpp index 6f35dcd32f4..48c1b69e894 100644 --- a/lldb/source/Utility/LLDBAssert.cpp +++ b/lldb/source/Utility/LLDBAssert.cpp @@ -1,5 +1,4 @@ -//===--------------------- LLDBAssert.cpp --------------------------*- C++ -//-*-===// +//===--------------------- LLDBAssert.cpp ------------------------*- C++-*-===// // // The LLVM Compiler Infrastructure // diff --git a/lldb/source/Utility/Log.cpp b/lldb/source/Utility/Log.cpp index 6c27ba228e5..a80b106838b 100644 --- a/lldb/source/Utility/Log.cpp +++ b/lldb/source/Utility/Log.cpp @@ -7,28 +7,32 @@ // //===----------------------------------------------------------------------===// -// Project includes #include "lldb/Utility/Log.h" #include "lldb/Utility/VASPrintf.h" -#include "lldb/lldb-types.h" -// Other libraries and framework includes #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/Twine.h" // for operator+, Twine +#include "llvm/ADT/iterator.h" // for iterator_facade_base + #include "llvm/Support/Chrono.h" +#include "llvm/Support/ManagedStatic.h" // for ManagedStatic #include "llvm/Support/Path.h" #include "llvm/Support/Signals.h" #include "llvm/Support/Threading.h" #include "llvm/Support/raw_ostream.h" -// C Includes -// C++ Includes +#include <chrono> // for duration, system_clock, syst... #include <cstdarg> -#include <cstdio> -#include <cstdlib> -#include <map> #include <mutex> -#include <string> +#include <utility> // for pair + +#include <assert.h> // for assert +#if defined(LLVM_ON_WIN32) +#include <process.h> // for getpid +#else +#include <unistd.h> +#endif using namespace lldb_private; diff --git a/lldb/source/Utility/Logging.cpp b/lldb/source/Utility/Logging.cpp index 5965ff52312..0bd6d6692e3 100644 --- a/lldb/source/Utility/Logging.cpp +++ b/lldb/source/Utility/Logging.cpp @@ -10,6 +10,10 @@ #include "lldb/Utility/Logging.h" #include "lldb/Utility/Log.h" +#include "llvm/ADT/ArrayRef.h" // for ArrayRef + +#include <stdarg.h> // for va_end, va_list, va_start + using namespace lldb_private; static constexpr Log::Category g_categories[] = { diff --git a/lldb/source/Utility/Range.cpp b/lldb/source/Utility/Range.cpp index 95f00e5c759..9d1d28ea484 100644 --- a/lldb/source/Utility/Range.cpp +++ b/lldb/source/Utility/Range.cpp @@ -1,5 +1,4 @@ -//===--------------------- Range.cpp -----------------------------*- C++ -//-*-===// +//===--------------------- Range.cpp -----------------------------*- C++-*-===// // // The LLVM Compiler Infrastructure // @@ -10,6 +9,9 @@ #include "lldb/Utility/Range.h" +#include <algorithm> +#include <utility> + using namespace lldb_utility; Range::Range(const Range &rng) : m_low(rng.m_low), m_high(rng.m_high) { diff --git a/lldb/source/Utility/RegularExpression.cpp b/lldb/source/Utility/RegularExpression.cpp index 15b183fdd66..d58b315d0d1 100644 --- a/lldb/source/Utility/RegularExpression.cpp +++ b/lldb/source/Utility/RegularExpression.cpp @@ -9,15 +9,9 @@ #include "lldb/Utility/RegularExpression.h" -// C Includes -// C++ Includes -#include <cstring> - -// Other libraries and framework includes #include "llvm/ADT/StringRef.h" -// Project includes -#include "lldb/Utility/Error.h" +#include <string> //---------------------------------------------------------------------- // Enable enhanced mode if it is available. This allows for things like diff --git a/lldb/source/Utility/SelectHelper.cpp b/lldb/source/Utility/SelectHelper.cpp index 2576f4a158d..7b0557ea192 100644 --- a/lldb/source/Utility/SelectHelper.cpp +++ b/lldb/source/Utility/SelectHelper.cpp @@ -14,7 +14,18 @@ #define _DARWIN_UNLIMITED_SELECT #endif -// C Includes +#include "lldb/Utility/SelectHelper.h" +#include "lldb/Utility/Error.h" +#include "lldb/Utility/LLDBAssert.h" +#include "lldb/lldb-enumerations.h" // for ErrorType::eErrorTypePOSIX +#include "lldb/lldb-types.h" // for socket_t + +#include "llvm/ADT/DenseMap.h" // for DenseMapPair, DenseMap, Dense... +#include "llvm/ADT/Optional.h" // for Optional + +#include <algorithm> +#include <chrono> // for microseconds, seconds, steady... + #include <errno.h> #if defined(_WIN32) // Define NOMINMAX to avoid macros that conflict with std::min and std::max @@ -24,16 +35,6 @@ #include <sys/select.h> #endif -// C++ Includes -#include <algorithm> - -// Other libraries and framework includes -#include "llvm/ADT/SmallVector.h" - -// Project includes -#include "lldb/Utility/Error.h" -#include "lldb/Utility/LLDBAssert.h" -#include "lldb/Utility/SelectHelper.h" SelectHelper::SelectHelper() : m_fd_map(), m_end_time() // Infinite timeout unless diff --git a/lldb/source/Utility/Stream.cpp b/lldb/source/Utility/Stream.cpp index 8899a43496c..04edc25b2b0 100644 --- a/lldb/source/Utility/Stream.cpp +++ b/lldb/source/Utility/Stream.cpp @@ -11,12 +11,12 @@ #include "lldb/Utility/Endian.h" #include "lldb/Utility/VASPrintf.h" -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "llvm/ADT/SmallString.h" // for SmallString + +#include <string> #include <inttypes.h> +#include <stddef.h> using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Utility/StreamCallback.cpp b/lldb/source/Utility/StreamCallback.cpp index 854cf4b55fa..97528439005 100644 --- a/lldb/source/Utility/StreamCallback.cpp +++ b/lldb/source/Utility/StreamCallback.cpp @@ -9,6 +9,8 @@ #include "lldb/Utility/StreamCallback.h" +#include <string> + using namespace lldb_private; StreamCallback::StreamCallback(lldb::LogOutputCallback callback, void *baton) diff --git a/lldb/source/Utility/StreamGDBRemote.cpp b/lldb/source/Utility/StreamGDBRemote.cpp index 08e19650966..2620e3786d2 100644 --- a/lldb/source/Utility/StreamGDBRemote.cpp +++ b/lldb/source/Utility/StreamGDBRemote.cpp @@ -8,6 +8,10 @@ //===----------------------------------------------------------------------===// #include "lldb/Utility/StreamGDBRemote.h" + +#include "lldb/Utility/Flags.h" // for Flags +#include "lldb/Utility/Stream.h" // for Stream::::eBinary + #include <stdio.h> using namespace lldb; diff --git a/lldb/source/Utility/StreamString.cpp b/lldb/source/Utility/StreamString.cpp index a73962da1d1..75f58de28b9 100644 --- a/lldb/source/Utility/StreamString.cpp +++ b/lldb/source/Utility/StreamString.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// #include "lldb/Utility/StreamString.h" -#include <stdio.h> using namespace lldb; using namespace lldb_private; diff --git a/lldb/source/Utility/StringExtractor.cpp b/lldb/source/Utility/StringExtractor.cpp index d8ba39710d1..a94f6bcd008 100644 --- a/lldb/source/Utility/StringExtractor.cpp +++ b/lldb/source/Utility/StringExtractor.cpp @@ -9,13 +9,11 @@ #include "lldb/Utility/StringExtractor.h" -// C Includes -#include <stdlib.h> - -// C++ Includes #include <tuple> -// Other libraries and framework includes -// Project includes + +#include <ctype.h> // for isxdigit, isspace +#include <stdlib.h> +#include <string.h> // for memset static inline int xdigit_to_sint(char ch) { if (ch >= 'a' && ch <= 'f') diff --git a/lldb/source/Utility/StringExtractorGDBRemote.cpp b/lldb/source/Utility/StringExtractorGDBRemote.cpp index 7de7ebfa2a6..08226f4c8f9 100644 --- a/lldb/source/Utility/StringExtractorGDBRemote.cpp +++ b/lldb/source/Utility/StringExtractorGDBRemote.cpp @@ -7,14 +7,11 @@ // //===----------------------------------------------------------------------===// -// C Includes -#include <string.h> - -// C++ Includes -// Other libraries and framework includes -// Project includes #include "Utility/StringExtractorGDBRemote.h" +#include <ctype.h> // for isxdigit +#include <string.h> + StringExtractorGDBRemote::ResponseType StringExtractorGDBRemote::GetResponseType() const { if (m_packet.empty()) diff --git a/lldb/source/Utility/StringExtractorGDBRemote.h b/lldb/source/Utility/StringExtractorGDBRemote.h index 28df7fa346d..a5c0c8e803b 100644 --- a/lldb/source/Utility/StringExtractorGDBRemote.h +++ b/lldb/source/Utility/StringExtractorGDBRemote.h @@ -10,12 +10,13 @@ #ifndef utility_StringExtractorGDBRemote_h_ #define utility_StringExtractorGDBRemote_h_ -// C Includes -// C++ Includes -#include <string> -// Other libraries and framework includes -// Project includes #include "lldb/Utility/StringExtractor.h" +#include "llvm/ADT/StringRef.h" // for StringRef + +#include <string> + +#include <stddef.h> // for size_t +#include <stdint.h> // for uint8_t class StringExtractorGDBRemote : public StringExtractor { public: diff --git a/lldb/source/Utility/StringLexer.cpp b/lldb/source/Utility/StringLexer.cpp index ec18f049476..77484d6e43f 100644 --- a/lldb/source/Utility/StringLexer.cpp +++ b/lldb/source/Utility/StringLexer.cpp @@ -1,5 +1,4 @@ -//===--------------------- StringLexer.cpp -----------------------*- C++ -//-*-===// +//===--------------------- StringLexer.cpp -----------------------*- C++-*-===// // // The LLVM Compiler Infrastructure // diff --git a/lldb/source/Utility/StringList.cpp b/lldb/source/Utility/StringList.cpp index d8f5b14cc22..190cb9d682c 100644 --- a/lldb/source/Utility/StringList.cpp +++ b/lldb/source/Utility/StringList.cpp @@ -10,9 +10,13 @@ #include "lldb/Utility/StringList.h" #include "lldb/Utility/Log.h" +#include "lldb/Utility/Stream.h" // for Stream #include "lldb/Utility/StreamString.h" +#include "llvm/ADT/ArrayRef.h" // for ArrayRef, makeArrayRef -#include <string> +#include <algorithm> // for min +#include <stdint.h> // for SIZE_MAX, uint32_t +#include <string.h> // for size_t, strcspn, NULL using namespace lldb_private; diff --git a/lldb/source/Utility/TaskPool.cpp b/lldb/source/Utility/TaskPool.cpp index f66f7bf9170..244e64fdb5f 100644 --- a/lldb/source/Utility/TaskPool.cpp +++ b/lldb/source/Utility/TaskPool.cpp @@ -9,6 +9,10 @@ #include "lldb/Utility/TaskPool.h" +#include <cstdint> // for uint32_t +#include <queue> // for queue +#include <thread> // for thread + namespace { class TaskPoolImpl { public: diff --git a/lldb/source/Utility/TildeExpressionResolver.cpp b/lldb/source/Utility/TildeExpressionResolver.cpp index 2ad0c4e119d..64a771118d6 100644 --- a/lldb/source/Utility/TildeExpressionResolver.cpp +++ b/lldb/source/Utility/TildeExpressionResolver.cpp @@ -9,9 +9,15 @@ #include "lldb/Utility/TildeExpressionResolver.h" -#include "llvm/ADT/SmallString.h" +#include <assert.h> // for assert +#include <system_error> // for error_code + +#include "llvm/ADT/STLExtras.h" // for any_of +#include "llvm/ADT/SmallVector.h" // for SmallVectorImpl +#include "llvm/Config/llvm-config.h" // for LLVM_ON_WIN32 #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" +#include "llvm/Support/raw_ostream.h" // for fs #if !defined(LLVM_ON_WIN32) #include <pwd.h> diff --git a/lldb/source/Utility/UUID.cpp b/lldb/source/Utility/UUID.cpp index d60da0d354a..d82f4d41215 100644 --- a/lldb/source/Utility/UUID.cpp +++ b/lldb/source/Utility/UUID.cpp @@ -12,7 +12,6 @@ // Other libraries and framework includes // Project includes #include "lldb/Utility/Stream.h" - #include "llvm/ADT/StringRef.h" // C Includes @@ -20,9 +19,6 @@ #include <stdio.h> #include <string.h> -// C++ Includes -#include <string> - namespace lldb_private { UUID::UUID() : m_num_uuid_bytes(16) { ::memset(m_uuid, 0, sizeof(m_uuid)); } diff --git a/lldb/source/Utility/UriParser.cpp b/lldb/source/Utility/UriParser.cpp index 6f4132860bf..bb57211af46 100644 --- a/lldb/source/Utility/UriParser.cpp +++ b/lldb/source/Utility/UriParser.cpp @@ -8,7 +8,11 @@ //===----------------------------------------------------------------------===// #include "lldb/Utility/UriParser.h" -#include <cstring> + +#include <string> + +#include <stdint.h> +#include <tuple> using namespace lldb_private; diff --git a/lldb/source/Utility/VASprintf.cpp b/lldb/source/Utility/VASprintf.cpp index c3006ddc2fb..e950fb75cfa 100644 --- a/lldb/source/Utility/VASprintf.cpp +++ b/lldb/source/Utility/VASprintf.cpp @@ -10,8 +10,12 @@ #include "lldb/Utility/VASPrintf.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/SmallVector.h" // for SmallVectorImpl +#include "llvm/ADT/StringRef.h" // for StringRef -using namespace lldb_private; +#include <assert.h> // for assert +#include <stdarg.h> // for va_end, va_list, va_copy +#include <stdio.h> // for vsnprintf, size_t bool lldb_private::VASprintf(llvm::SmallVectorImpl<char> &buf, const char *fmt, va_list args) { diff --git a/lldb/source/Utility/VMRange.cpp b/lldb/source/Utility/VMRange.cpp index c23065ada54..5eccd292a85 100644 --- a/lldb/source/Utility/VMRange.cpp +++ b/lldb/source/Utility/VMRange.cpp @@ -7,11 +7,17 @@ // //===----------------------------------------------------------------------===// -#include "lldb/lldb-private.h" +#include "lldb/Utility/VMRange.h" #include "lldb/Utility/Stream.h" -#include "lldb/Utility/VMRange.h" +#include "lldb/lldb-types.h" // for addr_t + #include <algorithm> +#include <iterator> // for distance +#include <vector> // for const_iterator + +#include <stddef.h> // for size_t +#include <stdint.h> // for UINT32_MAX, uint32_t using namespace lldb; using namespace lldb_private; diff --git a/lldb/tools/lldb-mi/MICmdCmdStack.cpp b/lldb/tools/lldb-mi/MICmdCmdStack.cpp index 6e8455c4aad..b491027bf80 100644 --- a/lldb/tools/lldb-mi/MICmdCmdStack.cpp +++ b/lldb/tools/lldb-mi/MICmdCmdStack.cpp @@ -32,6 +32,8 @@ #include "MICmnMIResultRecord.h" #include "MICmnMIValueConst.h" +#include <algorithm> + //++ //------------------------------------------------------------------------------------ // Details: CMICmdCmdStackInfoDepth constructor. diff --git a/lldb/tools/lldb-mi/MICmdCmdVar.cpp b/lldb/tools/lldb-mi/MICmdCmdVar.cpp index 9647ddc94d6..3396b7231c5 100644 --- a/lldb/tools/lldb-mi/MICmdCmdVar.cpp +++ b/lldb/tools/lldb-mi/MICmdCmdVar.cpp @@ -38,6 +38,8 @@ #include "MICmnMIResultRecord.h" #include "MICmnMIValueConst.h" +#include <algorithm> + //++ //------------------------------------------------------------------------------------ // Details: CMICmdCmdVarCreate constructor. diff --git a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp index e975dd6525e..a61244f92fc 100644 --- a/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp +++ b/lldb/tools/lldb-mi/MICmnLLDBDebuggerHandleEvents.cpp @@ -40,6 +40,8 @@ #include "MIUtilDebug.h" #include "Platform.h" // for PATH_MAX +#include <algorithm> + //++ //------------------------------------------------------------------------------------ // Details: CMICmnLLDBDebuggerHandleEvents constructor. |
