[Lldb-commits] [lldb] r124888 - in /lldb/trunk: include/lldb/Core/ include/lldb/Symbol/ include/lldb/Target/ source/Commands/ source/Core/ source/Host/common/ source/Host/macosx/ source/Plugins/DynamicLoader/MacOSX-DYLD/ source/Plugins/ObjectFile/ELF/ source/Plugins/ObjectFile/Mach-O/ source/Plugins/SymbolFile/DWARF/ source/Plugins/SymbolVendor/MacOSX/ source/Target/ tools/driver/
Greg Clayton
gclayton at apple.com
Fri Feb 4 10:53:10 PST 2011
Author: gclayton
Date: Fri Feb 4 12:53:10 2011
New Revision: 124888
URL: http://llvm.org/viewvc/llvm-project?rev=124888&view=rev
Log:
Applied a fix to qualify "UUID" with the lldb_private namespace to fix
build issues on MinGW.
Modified:
lldb/trunk/include/lldb/Core/Module.h
lldb/trunk/include/lldb/Core/ModuleList.h
lldb/trunk/include/lldb/Symbol/ObjectFile.h
lldb/trunk/include/lldb/Target/Target.h
lldb/trunk/include/lldb/Target/TargetList.h
lldb/trunk/source/Commands/CommandObjectImage.cpp
lldb/trunk/source/Core/DataExtractor.cpp
lldb/trunk/source/Core/Module.cpp
lldb/trunk/source/Core/ModuleList.cpp
lldb/trunk/source/Core/UUID.cpp
lldb/trunk/source/Host/common/Symbols.cpp
lldb/trunk/source/Host/macosx/Symbols.cpp
lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
lldb/trunk/source/Target/Target.cpp
lldb/trunk/source/Target/TargetList.cpp
lldb/trunk/tools/driver/Driver.cpp
Modified: lldb/trunk/include/lldb/Core/Module.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Module.h?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Module.h (original)
+++ lldb/trunk/include/lldb/Core/Module.h Fri Feb 4 12:53:10 2011
@@ -416,7 +416,7 @@
/// this module if this module has a valid UUID value, NULL
/// otherwise.
//------------------------------------------------------------------
- const UUID &
+ const lldb_private::UUID &
GetUUID ();
//------------------------------------------------------------------
@@ -559,7 +559,7 @@
mutable Mutex m_mutex; ///< A mutex to keep this object happy in multi-threaded environments.
TimeValue m_mod_time; ///< The modification time for this module when it was created.
ArchSpec m_arch; ///< The architecture for this module.
- UUID m_uuid; ///< Each module is assumed to have a unique identifier to help match it up to debug symbols.
+ lldb_private::UUID m_uuid; ///< Each module is assumed to have a unique identifier to help match it up to debug symbols.
FileSpec m_file; ///< The file representation on disk for this module (if there is one).
ConstString m_object_name; ///< The name an object within this module that is selected, or empty of the module is represented by \a m_file.
std::auto_ptr<ObjectFile> m_objfile_ap; ///< A pointer to the object file parser for this module.
Modified: lldb/trunk/include/lldb/Core/ModuleList.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/ModuleList.h?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/ModuleList.h (original)
+++ lldb/trunk/include/lldb/Core/ModuleList.h Fri Feb 4 12:53:10 2011
@@ -259,7 +259,7 @@
size_t
FindModules (const FileSpec *file_spec_ptr,
const ArchSpec *arch_ptr,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name,
ModuleList& matching_module_list) const;
@@ -368,7 +368,7 @@
static Error
GetSharedModule (const FileSpec& file_spec,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name,
off_t object_offset,
lldb::ModuleSP &module_sp,
@@ -378,7 +378,7 @@
static size_t
FindSharedModules (const FileSpec& in_file_spec,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name_ptr,
ModuleList &matching_module_list);
Modified: lldb/trunk/include/lldb/Symbol/ObjectFile.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ObjectFile.h?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ObjectFile.h (original)
+++ lldb/trunk/include/lldb/Symbol/ObjectFile.h Fri Feb 4 12:53:10 2011
@@ -279,7 +279,7 @@
/// \a uuid, \b false otherwise.
//------------------------------------------------------------------
virtual bool
- GetUUID (UUID* uuid) = 0;
+ GetUUID (lldb_private::UUID* uuid) = 0;
//------------------------------------------------------------------
/// Gets whether endian swapping should occur when extracting data
Modified: lldb/trunk/include/lldb/Target/Target.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/Target.h?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/Target.h (original)
+++ lldb/trunk/include/lldb/Target/Target.h Fri Feb 4 12:53:10 2011
@@ -154,7 +154,7 @@
lldb::ModuleSP
GetSharedModule (const FileSpec& file_spec,
const ArchSpec& arch,
- const UUID *uuid = NULL,
+ const lldb_private::UUID *uuid = NULL,
const ConstString *object_name = NULL,
off_t object_offset = 0,
Error *error_ptr = NULL);
Modified: lldb/trunk/include/lldb/Target/TargetList.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/TargetList.h?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Target/TargetList.h (original)
+++ lldb/trunk/include/lldb/Target/TargetList.h Fri Feb 4 12:53:10 2011
@@ -82,7 +82,7 @@
CreateTarget (Debugger &debugger,
const FileSpec& file_spec,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
bool get_dependent_files,
lldb::TargetSP &target_sp);
Modified: lldb/trunk/source/Commands/CommandObjectImage.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Commands/CommandObjectImage.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Commands/CommandObjectImage.cpp (original)
+++ lldb/trunk/source/Commands/CommandObjectImage.cpp Fri Feb 4 12:53:10 2011
@@ -1312,7 +1312,7 @@
CommandObjectImageList::CommandOptions::g_option_table[] =
{
{ LLDB_OPT_SET_1, false, "arch", 'a', optional_argument, NULL, 0, eArgTypeWidth, "Display the architecture when listing images."},
-{ LLDB_OPT_SET_1, false, "uuid", 'u', no_argument, NULL, 0, eArgTypeNone, "Display the UUID when listing images."},
+{ LLDB_OPT_SET_1, false, "uuid", 'u', no_argument, NULL, 0, eArgTypeNone, "Display the UUID when listing images."},
{ LLDB_OPT_SET_1, false, "fullpath", 'f', optional_argument, NULL, 0, eArgTypeWidth, "Display the fullpath to the image object file."},
{ LLDB_OPT_SET_1, false, "directory", 'd', optional_argument, NULL, 0, eArgTypeWidth, "Display the directory with optional width for the image object file."},
{ LLDB_OPT_SET_1, false, "basename", 'b', optional_argument, NULL, 0, eArgTypeWidth, "Display the basename with optional width for the image object file."},
Modified: lldb/trunk/source/Core/DataExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/DataExtractor.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Core/DataExtractor.cpp (original)
+++ lldb/trunk/source/Core/DataExtractor.cpp Fri Feb 4 12:53:10 2011
@@ -1657,7 +1657,7 @@
const uint8_t *uuid_data = PeekData(offset, 16);
if ( uuid_data )
{
- UUID uuid(uuid_data, 16);
+ lldb_private::UUID uuid(uuid_data, 16);
uuid.Dump(s);
}
else
Modified: lldb/trunk/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Module.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Core/Module.cpp (original)
+++ lldb/trunk/source/Core/Module.cpp Fri Feb 4 12:53:10 2011
@@ -78,7 +78,7 @@
return ModuleList::GetModuleSP (this);
}
-const UUID&
+const lldb_private::UUID&
Module::GetUUID()
{
Mutex::Locker locker (m_mutex);
Modified: lldb/trunk/source/Core/ModuleList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ModuleList.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Core/ModuleList.cpp (original)
+++ lldb/trunk/source/Core/ModuleList.cpp Fri Feb 4 12:53:10 2011
@@ -215,7 +215,7 @@
//--------------------------------------------------------------
ModuleMatches (const FileSpec *file_spec_ptr,
const ArchSpec *arch_ptr,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name) :
m_file_spec_ptr (file_spec_ptr),
m_arch_ptr (arch_ptr),
@@ -260,10 +260,10 @@
//--------------------------------------------------------------
// Member variables.
//--------------------------------------------------------------
- const FileSpec * m_file_spec_ptr;
- const ArchSpec * m_arch_ptr;
- const UUID * m_uuid_ptr;
- const ConstString * m_object_name;
+ const FileSpec * m_file_spec_ptr;
+ const ArchSpec * m_arch_ptr;
+ const lldb_private::UUID * m_uuid_ptr;
+ const ConstString * m_object_name;
};
size_t
@@ -271,7 +271,7 @@
(
const FileSpec *file_spec_ptr,
const ArchSpec *arch_ptr,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name,
ModuleList& matching_module_list
) const
@@ -534,7 +534,7 @@
(
const FileSpec& in_file_spec,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name_ptr,
ModuleList &matching_module_list
)
@@ -549,7 +549,7 @@
(
const FileSpec& in_file_spec,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name_ptr,
off_t object_offset,
ModuleSP &module_sp,
Modified: lldb/trunk/source/Core/UUID.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UUID.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Core/UUID.cpp (original)
+++ lldb/trunk/source/Core/UUID.cpp Fri Feb 4 12:53:10 2011
@@ -18,7 +18,7 @@
// Project includes
#include "lldb/Core/Stream.h"
-using namespace lldb_private;
+namespace lldb_private {
UUID::UUID()
{
@@ -175,40 +175,40 @@
return 0;
}
-
+}
bool
-lldb_private::operator == (const UUID &lhs, const UUID &rhs)
+lldb_private::operator == (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
{
- return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) == 0;
+ return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) == 0;
}
bool
-lldb_private::operator != (const UUID &lhs, const UUID &rhs)
+lldb_private::operator != (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
{
return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) != 0;
}
bool
-lldb_private::operator < (const UUID &lhs, const UUID &rhs)
+lldb_private::operator < (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
{
- return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) < 0;
+ return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) < 0;
}
bool
-lldb_private::operator <= (const UUID &lhs, const UUID &rhs)
+lldb_private::operator <= (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
{
- return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) <= 0;
+ return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) <= 0;
}
bool
-lldb_private::operator > (const UUID &lhs, const UUID &rhs)
+lldb_private::operator > (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
{
- return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) > 0;
+ return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) > 0;
}
bool
-lldb_private::operator >= (const UUID &lhs, const UUID &rhs)
+lldb_private::operator >= (const lldb_private::UUID &lhs, const lldb_private::UUID &rhs)
{
- return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), UUID::GetByteSize()) >= 0;
+ return ::memcmp (lhs.GetBytes(), rhs.GetBytes(), lldb_private::UUID::GetByteSize()) >= 0;
}
Modified: lldb/trunk/source/Host/common/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/Symbols.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Host/common/Symbols.cpp (original)
+++ lldb/trunk/source/Host/common/Symbols.cpp Fri Feb 4 12:53:10 2011
@@ -15,14 +15,14 @@
#if !defined (__APPLE__)
FileSpec
-Symbols::LocateExecutableObjectFile (const FileSpec *exec_fspec, const ArchSpec* arch, const UUID *uuid)
+Symbols::LocateExecutableObjectFile (const FileSpec *exec_fspec, const ArchSpec* arch, const lldb_private::UUID *uuid)
{
// FIXME
return FileSpec();
}
FileSpec
-Symbols::LocateExecutableSymbolFile (const FileSpec *exec_fspec, const ArchSpec* arch, const UUID *uuid)
+Symbols::LocateExecutableSymbolFile (const FileSpec *exec_fspec, const ArchSpec* arch, const lldb_private::UUID *uuid)
{
// FIXME
return FileSpec();
Modified: lldb/trunk/source/Host/macosx/Symbols.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/macosx/Symbols.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Host/macosx/Symbols.cpp (original)
+++ lldb/trunk/source/Host/macosx/Symbols.cpp Fri Feb 4 12:53:10 2011
@@ -46,7 +46,7 @@
(
const FileSpec &file_spec,
const ArchSpec *arch,
- const UUID *uuid, // the UUID we are looking for
+ const lldb_private::UUID *uuid, // the UUID we are looking for
off_t file_offset,
DataExtractor& data,
uint32_t data_offset,
@@ -112,7 +112,7 @@
uint32_t cmd_size = data.GetU32(&data_offset);
if (cmd == LoadCommandUUID)
{
- UUID file_uuid (data.GetData(&data_offset, 16), 16);
+ lldb_private::UUID file_uuid (data.GetData(&data_offset, 16), 16);
return file_uuid == *uuid;
}
data_offset = cmd_offset + cmd_size;
@@ -125,7 +125,7 @@
(
const FileSpec &file_spec,
const ArchSpec *arch,
- const UUID *uuid,
+ const lldb_private::UUID *uuid,
off_t file_offset,
DataExtractor& data,
uint32_t data_offset,
@@ -188,7 +188,7 @@
(
const FileSpec &file_spec,
const ArchSpec *arch,
- const UUID *uuid
+ const lldb_private::UUID *uuid
)
{
DataExtractor data;
@@ -227,7 +227,7 @@
LocateDSYMMachFileInDSYMBundle
(
const FileSpec& dsym_bundle_fspec,
- const UUID *uuid,
+ const lldb_private::UUID *uuid,
const ArchSpec *arch)
{
char path[PATH_MAX];
@@ -273,7 +273,7 @@
(
const FileSpec *exec_fspec, // An executable path that may or may not be correct if UUID is specified
const ArchSpec* arch, // Limit the search to files with this architecture if non-NULL
- const UUID *uuid, // Match the UUID value if non-NULL,
+ const lldb_private::UUID *uuid, // Match the UUID value if non-NULL,
FileSpec *out_exec_fspec, // If non-NULL, try and find the executable
FileSpec *out_dsym_fspec // If non-NULL try and find the debug symbol file
)
@@ -369,7 +369,7 @@
}
static bool
-LocateDSYMInVincinityOfExecutable (const FileSpec *exec_fspec, const ArchSpec* arch, const UUID *uuid, FileSpec &dsym_fspec)
+LocateDSYMInVincinityOfExecutable (const FileSpec *exec_fspec, const ArchSpec* arch, const lldb_private::UUID *uuid, FileSpec &dsym_fspec)
{
if (exec_fspec)
{
@@ -429,7 +429,7 @@
}
FileSpec
-Symbols::LocateExecutableObjectFile (const FileSpec *exec_fspec, const ArchSpec* arch, const UUID *uuid)
+Symbols::LocateExecutableObjectFile (const FileSpec *exec_fspec, const ArchSpec* arch, const lldb_private::UUID *uuid)
{
Timer scoped_timer (__PRETTY_FUNCTION__,
"LocateExecutableObjectFile (file = %s, arch = %s, uuid = %p)",
@@ -446,7 +446,7 @@
}
FileSpec
-Symbols::LocateExecutableSymbolFile (const FileSpec *exec_fspec, const ArchSpec* arch, const UUID *uuid)
+Symbols::LocateExecutableSymbolFile (const FileSpec *exec_fspec, const ArchSpec* arch, const lldb_private::UUID *uuid)
{
Timer scoped_timer (__PRETTY_FUNCTION__,
"LocateExecutableSymbolFile (file = %s, arch = %s, uuid = %p)",
Modified: lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp (original)
+++ lldb/trunk/source/Plugins/DynamicLoader/MacOSX-DYLD/DynamicLoaderMacOSXDYLD.cpp Fri Feb 4 12:53:10 2011
@@ -42,7 +42,7 @@
DynamicLoaderMacOSXDYLD::DYLDImageInfo *
-DynamicLoaderMacOSXDYLD::GetImageInfo (const FileSpec &file_spec, const UUID &uuid)
+DynamicLoaderMacOSXDYLD::GetImageInfo (const FileSpec &file_spec, const lldb_private::UUID &uuid)
{
DYLDImageInfo::collection::iterator pos, end = m_dyld_image_infos.end();
for (pos = m_dyld_image_infos.begin(); pos != end; ++pos)
Modified: lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp Fri Feb 4 12:53:10 2011
@@ -207,7 +207,7 @@
}
bool
-ObjectFileELF::GetUUID(UUID* uuid)
+ObjectFileELF::GetUUID(lldb_private::UUID* uuid)
{
// FIXME: Return MD5 sum here. See comment in ObjectFile.h.
return false;
Modified: lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp (original)
+++ lldb/trunk/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp Fri Feb 4 12:53:10 2011
@@ -1362,7 +1362,7 @@
bool
-ObjectFileMachO::GetUUID (UUID* uuid)
+ObjectFileMachO::GetUUID (lldb_private::UUID* uuid)
{
lldb_private::Mutex::Locker locker(m_mutex);
struct uuid_command load_cmd;
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp Fri Feb 4 12:53:10 2011
@@ -168,7 +168,7 @@
ModuleList::GetSharedModule (oso_file_spec,
m_obj_file->GetModule()->GetArchitecture(),
- NULL, // UUID pointer
+ NULL, // lldb_private::UUID pointer
NULL, // object name
0, // object offset
comp_unit_info->oso_module_sp,
Modified: lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp Fri Feb 4 12:53:10 2011
@@ -43,7 +43,7 @@
if (module && ofile)
{
// Make sure the UUIDs match
- UUID dsym_uuid;
+ lldb_private::UUID dsym_uuid;
if (ofile->GetUUID(&dsym_uuid))
return dsym_uuid == module->GetUUID();
}
Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Fri Feb 4 12:53:10 2011
@@ -700,7 +700,7 @@
(
const FileSpec& file_spec,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
const ConstString *object_name,
off_t object_offset,
Error *error_ptr
Modified: lldb/trunk/source/Target/TargetList.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/TargetList.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/source/Target/TargetList.cpp (original)
+++ lldb/trunk/source/Target/TargetList.cpp Fri Feb 4 12:53:10 2011
@@ -49,7 +49,7 @@
Debugger &debugger,
const FileSpec& file,
const ArchSpec& arch,
- const UUID *uuid_ptr,
+ const lldb_private::UUID *uuid_ptr,
bool get_dependent_files,
TargetSP &target_sp
)
Modified: lldb/trunk/tools/driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Driver.cpp?rev=124888&r1=124887&r2=124888&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Driver.cpp (original)
+++ lldb/trunk/tools/driver/Driver.cpp Fri Feb 4 12:53:10 2011
@@ -935,7 +935,7 @@
//{
// std::string path;
// VMRange text_range;
-// UUID uuid;
+// lldb_private::UUID uuid;
//};
//
//void
More information about the lldb-commits
mailing list