:-) Thanks for fixing my Xcode additions.<br><br>On Monday, June 2, 2014, Greg Clayton <<a href="mailto:gclayton@apple.com">gclayton@apple.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: gclayton<br>
Date: Mon Jun 2 16:58:30 2014<br>
New Revision: 210051<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=210051&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=210051&view=rev</a><br>
Log:<br>
Small cleanups for the new enum fixes:<br>
- Fix Xcode project to have source files for SBTypeEnumMember.h/SBTypeEnumMember.cpp in the right place<br>
- Rename a member variable to inluce "_sp" suffix since it is a shared pointer<br>
- Cleanup initialization code for TypeEnumMemberImpl to not warn about out of order initialization<br>
<br>
<br>
Modified:<br>
lldb/trunk/include/lldb/Symbol/Type.h<br>
lldb/trunk/lldb.xcodeproj/project.pbxproj<br>
lldb/trunk/source/Symbol/Type.cpp<br>
<br>
Modified: lldb/trunk/include/lldb/Symbol/Type.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Type.h?rev=210051&r1=210050&r2=210051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/Type.h?rev=210051&r1=210050&r2=210051&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/include/lldb/Symbol/Type.h (original)<br>
+++ lldb/trunk/include/lldb/Symbol/Type.h Mon Jun 2 16:58:30 2014<br>
@@ -792,7 +792,7 @@ class TypeEnumMemberImpl<br>
{<br>
public:<br>
TypeEnumMemberImpl () :<br>
- m_integer_type(),<br>
+ m_integer_type_sp(),<br>
m_name("<invalid>"),<br>
m_value(),<br>
m_valid(false)<br>
@@ -803,7 +803,7 @@ public:<br>
const lldb_private::ClangASTType& integer_type);<br>
<br>
TypeEnumMemberImpl (const TypeEnumMemberImpl& rhs) :<br>
- m_integer_type(rhs.m_integer_type),<br>
+ m_integer_type_sp(rhs.m_integer_type_sp),<br>
m_name(rhs.m_name),<br>
m_value(rhs.m_value),<br>
m_valid(rhs.m_valid)<br>
@@ -828,7 +828,7 @@ public:<br>
const lldb::TypeImplSP &<br>
GetIntegerType () const<br>
{<br>
- return m_integer_type;<br>
+ return m_integer_type_sp;<br>
}<br>
<br>
uint64_t<br>
@@ -844,7 +844,7 @@ public:<br>
}<br>
<br>
protected:<br>
- lldb::TypeImplSP m_integer_type;<br>
+ lldb::TypeImplSP m_integer_type_sp;<br>
ConstString m_name;<br>
llvm::APSInt m_value;<br>
bool m_valid;<br>
<br>
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=210051&r1=210050&r2=210051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=210051&r1=210050&r2=210051&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)<br>
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Mon Jun 2 16:58:30 2014<br>
@@ -2091,8 +2091,6 @@<br>
08FB7794FE84155DC02AAC07 /* lldb */ = {<br>
isa = PBXGroup;<br>
children = (<br>
- 23EFE38A193D1AEC00E54E54 /* SBTypeEnumMember.cpp */,<br>
- 23EFE388193D1ABC00E54E54 /* SBTypeEnumMember.h */,<br>
26F5C32810F3DF7D009D5894 /* Libraries */,<br>
264E8576159BE51A00E9D7A2 /* Resources */,<br>
08FB7795FE84155DC02AAC07 /* Source */,<br>
@@ -2522,6 +2520,8 @@<br>
261744771168585B005ADD65 /* SBType.cpp */,<br>
9475C18514E5E9C5001BFC6D /* SBTypeCategory.h */,<br>
9475C18714E5E9FA001BFC6D /* SBTypeCategory.cpp */,<br>
+ 23EFE388193D1ABC00E54E54 /* SBTypeEnumMember.h */,<br>
+ 23EFE38A193D1AEC00E54E54 /* SBTypeEnumMember.cpp */,<br>
9461568614E355F2003A195C /* SBTypeFilter.h */,<br>
9461568A14E35621003A195C /* SBTypeFilter.cpp */,<br>
9461568714E355F2003A195C /* SBTypeFormat.h */,<br>
<br>
Modified: lldb/trunk/source/Symbol/Type.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=210051&r1=210050&r2=210051&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/Type.cpp?rev=210051&r1=210050&r2=210051&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/source/Symbol/Type.cpp (original)<br>
+++ lldb/trunk/source/Symbol/Type.cpp Mon Jun 2 16:58:30 2014<br>
@@ -1171,9 +1171,17 @@ TypeImpl::GetDescription (lldb_private::<br>
<br>
TypeEnumMemberImpl::TypeEnumMemberImpl (const clang::EnumConstantDecl* enum_member_decl,<br>
const lldb_private::ClangASTType& integer_type) :<br>
- m_value(enum_member_decl->getInitVal()),<br>
- m_integer_type(new TypeImpl(integer_type))<br>
+ m_integer_type_sp(),<br>
+ m_name(),<br>
+ m_value(),<br>
+ m_valid(false)<br>
+<br>
{<br>
- m_name = ConstString(enum_member_decl->getNameAsString().c_str());<br>
- m_valid = true;<br>
+ if (enum_member_decl)<br>
+ {<br>
+ m_integer_type_sp.reset(new TypeImpl(integer_type));<br>
+ m_name = ConstString(enum_member_decl->getNameAsString().c_str());<br>
+ m_value = enum_member_decl->getInitVal();<br>
+ m_valid = true;<br>
+ }<br>
}<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="javascript:;" onclick="_e(event, 'cvml', 'lldb-commits@cs.uiuc.edu')">lldb-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits</a><br>
</blockquote><br><br>-- <br><div dir="ltr"><table cellspacing="0" cellpadding="0" style="color:rgb(136,136,136);font-family:'Times New Roman'"><tbody><tr style="color:rgb(85,85,85);font-family:sans-serif;font-size:small">
<td nowrap style="border-top-style:solid;border-top-color:rgb(213,15,37);border-top-width:2px">Todd Fiala |</td><td nowrap style="border-top-style:solid;border-top-color:rgb(51,105,232);border-top-width:2px"> Software Engineer |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(0,153,57);border-top-width:2px"> <a href="mailto:tfiala@google.com" style="color:rgb(17,85,204)" target="_blank"><span style="background-color:rgb(255,255,204);color:rgb(34,34,34);background-repeat:initial initial">tfiala@google.com</span></a> |</td>
<td nowrap style="border-top-style:solid;border-top-color:rgb(238,178,17);border-top-width:2px"><font color="#1155cc"> <a>650-943-3180</a></font></td></tr></tbody></table><br></div><br>