diff options
author | Bill Wendling <isanbard@gmail.com> | 2013-12-01 03:36:07 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2013-12-01 03:36:07 +0000 |
commit | 6e59964b45eae56f1de25e8bb6326a347df7cb56 (patch) | |
tree | fa6a6b6fa11843622c9b8db74eef4fda48b9e590 /lib/Transforms | |
parent | 15c773b6f276edfd57712cb9c2dd1738ef79efbd (diff) | |
download | llvm-6e59964b45eae56f1de25e8bb6326a347df7cb56.tar.gz llvm-6e59964b45eae56f1de25e8bb6326a347df7cb56.tar.bz2 llvm-6e59964b45eae56f1de25e8bb6326a347df7cb56.tar.xz |
Use 'unsigned char' to get this past gcc error message:
error: invalid conversion from 'unsigned char' to '{anonymous}::Sequence'
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196004 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Transforms')
-rw-r--r-- | lib/Transforms/ObjCARC/ObjCARCOpts.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp index 1cc665b2e0..2976df6b9d 100644 --- a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp +++ b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp @@ -432,7 +432,7 @@ namespace { bool Partial; /// The current position in the sequence. - Sequence Seq : 8; + unsigned char Seq : 8; /// Unidirectional information about the current sequence. RRInfo RRI; @@ -498,7 +498,7 @@ namespace { } Sequence GetSeq() const { - return Seq; + return static_cast<Sequence>(Seq); } void ClearSequenceProgress() { @@ -538,7 +538,8 @@ namespace { void PtrState::Merge(const PtrState &Other, bool TopDown) { - Seq = MergeSeqs(Seq, Other.Seq, TopDown); + Seq = MergeSeqs(static_cast<Sequence>(Seq), static_cast<Sequence>(Other.Seq), + TopDown); KnownPositiveRefCount &= Other.KnownPositiveRefCount; // If we're not in a sequence (anymore), drop all associated state. |