diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-02-22 08:54:55 -0500 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-02-22 08:54:55 -0500 |
commit | 25579df2d4b38e434aee4cf0368bf4ffc8ac847d (patch) | |
tree | c809d5a6f42f587c4e4e6d2bef50fae6ee7bdcb5 /Eigen/src/Core/Assign.h | |
parent | 3884308da7f460ccb810a0bd7b10d38c052b2925 (diff) |
'fix' a couple of clang -Wconstant-logical-operand warnings (still not convinced about the pertinence of that warning)
Diffstat (limited to 'Eigen/src/Core/Assign.h')
-rw-r--r-- | Eigen/src/Core/Assign.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/Assign.h b/Eigen/src/Core/Assign.h index b06d07d05..3a17152f0 100644 --- a/Eigen/src/Core/Assign.h +++ b/Eigen/src/Core/Assign.h @@ -41,7 +41,7 @@ public: DstIsAligned = Derived::Flags & AlignedBit, DstHasDirectAccess = Derived::Flags & DirectAccessBit, SrcIsAligned = OtherDerived::Flags & AlignedBit, - JointAlignment = DstIsAligned && SrcIsAligned ? Aligned : Unaligned + JointAlignment = bool(DstIsAligned) && bool(SrcIsAligned) ? Aligned : Unaligned }; private: @@ -106,9 +106,9 @@ public: : int(NoUnrolling) ) : int(Traversal) == int(LinearVectorizedTraversal) - ? ( int(MayUnrollCompletely) && int(DstIsAligned) ? int(CompleteUnrolling) : int(NoUnrolling) ) + ? ( bool(MayUnrollCompletely) && bool(DstIsAligned) ? int(CompleteUnrolling) : int(NoUnrolling) ) : int(Traversal) == int(LinearTraversal) - ? ( int(MayUnrollCompletely) ? int(CompleteUnrolling) : int(NoUnrolling) ) + ? ( bool(MayUnrollCompletely) ? int(CompleteUnrolling) : int(NoUnrolling) ) : int(NoUnrolling) }; |