diff options
| author | Vince Harron <vince@nethacker.com> | 2015-05-26 03:10:41 +0000 |
|---|---|---|
| committer | Vince Harron <vince@nethacker.com> | 2015-05-26 03:10:41 +0000 |
| commit | ebf2b2a10b4a43678ebee43f243b0c5f89b10f57 (patch) | |
| tree | 7aa15e7d23efdc66969abe11affbbe43db8df268 /lldb | |
| parent | 218353d84782995135f67eab2284837f12433d41 (diff) | |
| download | bcm5719-llvm-ebf2b2a10b4a43678ebee43f243b0c5f89b10f57.tar.gz bcm5719-llvm-ebf2b2a10b4a43678ebee43f243b0c5f89b10f57.zip | |
revert files unintentionally checked in
llvm-svn: 238174
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/include/lldb/Symbol/Type.h | 4 | ||||
| -rw-r--r-- | lldb/source/Symbol/Type.cpp | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lldb/include/lldb/Symbol/Type.h b/lldb/include/lldb/Symbol/Type.h index 02393c538b2..64cd3c0e8f4 100644 --- a/lldb/include/lldb/Symbol/Type.h +++ b/lldb/include/lldb/Symbol/Type.h @@ -305,9 +305,7 @@ protected: ClangASTType m_clang_type; struct Flags { - // clang_type_resolve_state is a ResolveState enum - // using unsigned type here to work around a very noisy gcc warning - unsigned clang_type_resolve_state : 2; + ResolveState clang_type_resolve_state : 2; bool is_complete_objc_class : 1; } m_flags; diff --git a/lldb/source/Symbol/Type.cpp b/lldb/source/Symbol/Type.cpp index 125448d0d51..6e67f4695d9 100644 --- a/lldb/source/Symbol/Type.cpp +++ b/lldb/source/Symbol/Type.cpp @@ -101,7 +101,7 @@ Type::Type m_decl (decl), m_clang_type (clang_type) { - m_flags.SetResolveState(clang_type ? clang_type_resolve_state : eResolveStateUnresolved); + m_flags.clang_type_resolve_state = (clang_type ? clang_type_resolve_state : eResolveStateUnresolved); m_flags.is_complete_objc_class = false; } @@ -118,7 +118,7 @@ Type::Type () : m_decl (), m_clang_type () { - m_flags.SetResolveState(eResolveStateUnresolved); + m_flags.clang_type_resolve_state = eResolveStateUnresolved; m_flags.is_complete_objc_class = false; } @@ -505,7 +505,7 @@ Type::ResolveClangType (ResolveState clang_type_resolve_state) if (encoding_clang_type.IsValid()) { m_clang_type = encoding_clang_type; - m_flags.SetResolveState(encoding_type->m_flags.clang_type_resolve_state); + m_flags.clang_type_resolve_state = encoding_type->m_flags.clang_type_resolve_state; } } break; @@ -594,7 +594,7 @@ Type::ResolveClangType (ResolveState clang_type_resolve_state) // Check if we have a forward reference to a class/struct/union/enum? if (m_clang_type.IsValid() && m_flags.clang_type_resolve_state < clang_type_resolve_state) { - m_flags.SetResolveState(eResolveStateFull); + m_flags.clang_type_resolve_state = eResolveStateFull; if (!m_clang_type.IsDefined ()) { // We have a forward declaration, we need to resolve it to a complete definition. |
