This revision was automatically updated to reflect the committed changes. Closed by commit rL251031: Attempt to fix MSVC builds after rL250966. (authored by eugenezelenko).
Changed prior to commit: http://reviews.llvm.org/D13968?vs=38070&id=38143#toc Repository: rL LLVM http://reviews.llvm.org/D13968 Files: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h Index: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h =================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h @@ -14,18 +14,18 @@ // C++ Includes #include <map> #include <vector> + // Other libraries and framework includes // Project includes #include "lldb/lldb-public.h" #include "lldb/Host/Mutex.h" - +#include "lldb/Expression/UtilityFunction.h" namespace lldb_private { class AppleObjCTrampolineHandler { public: - AppleObjCTrampolineHandler (const lldb::ProcessSP &process_sp, const lldb::ModuleSP &objc_module_sp); @@ -44,7 +44,6 @@ return (addr == m_msg_forward_addr || addr == m_msg_forward_stret_addr); } - struct DispatchFunction { public: typedef enum @@ -92,7 +91,6 @@ lldb::addr_t code_start; }; - class VTableRegion { public: @@ -189,7 +187,6 @@ lldb::break_id_t m_trampolines_changed_bp_id; region_collection m_regions; lldb::ModuleSP m_objc_module_sp; - }; static const DispatchFunction g_dispatch_functions[]; @@ -205,10 +202,8 @@ lldb::addr_t m_msg_forward_addr; lldb::addr_t m_msg_forward_stret_addr; std::unique_ptr<AppleObjCVTables> m_vtables_ap; - - }; -} // using namespace lldb_private +} // namespace lldb_private -#endif // lldb_AppleObjCTrampolineHandler_h_ +#endif // lldb_AppleObjCTrampolineHandler_h_
Index: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h =================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h @@ -14,18 +14,18 @@ // C++ Includes #include <map> #include <vector> + // Other libraries and framework includes // Project includes #include "lldb/lldb-public.h" #include "lldb/Host/Mutex.h" - +#include "lldb/Expression/UtilityFunction.h" namespace lldb_private { class AppleObjCTrampolineHandler { public: - AppleObjCTrampolineHandler (const lldb::ProcessSP &process_sp, const lldb::ModuleSP &objc_module_sp); @@ -44,7 +44,6 @@ return (addr == m_msg_forward_addr || addr == m_msg_forward_stret_addr); } - struct DispatchFunction { public: typedef enum @@ -92,7 +91,6 @@ lldb::addr_t code_start; }; - class VTableRegion { public: @@ -189,7 +187,6 @@ lldb::break_id_t m_trampolines_changed_bp_id; region_collection m_regions; lldb::ModuleSP m_objc_module_sp; - }; static const DispatchFunction g_dispatch_functions[]; @@ -205,10 +202,8 @@ lldb::addr_t m_msg_forward_addr; lldb::addr_t m_msg_forward_stret_addr; std::unique_ptr<AppleObjCVTables> m_vtables_ap; - - }; -} // using namespace lldb_private +} // namespace lldb_private -#endif // lldb_AppleObjCTrampolineHandler_h_ +#endif // lldb_AppleObjCTrampolineHandler_h_
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits