Merge pull request #21481 from mrodozov/fix-clang-unittest-from94x

Fix wrong bit shifting in TestPhiMemoryImage.cpp
cms-sw · Nov 29, 2017 · 8eb7f2c · 8eb7f2c
2 parents bd23f8c + 98e4676
commit 8eb7f2c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/L1Trigger/L1TMuonEndCap/test/unittests/TestPhiMemoryImage.cpp b/L1Trigger/L1TMuonEndCap/test/unittests/TestPhiMemoryImage.cpp
@@ -97,15 +97,15 @@ void TestPhiMemoryImage::test_rotation()
     image.rotl(i);
 
     if (i == 0)
-      CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word0 << i) | (word0 >> (64-i)));
+      CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word0 << i));
     else if (i < 64)
       CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word0 << i) | (word2 >> (64-i)));
     else if (i == 64)
-      CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word2 << (i-64)) | (word2 >> (128-i)));
+      CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word2 << (i-64)));
     else if (i < 128)
       CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word2 << (i-64)) | (word1 >> (128-i)));
     else if (i == 128)
-      CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word1 << (i-128)) | (word1 >> (192-i)));
+      CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word1 << (i-128)));
     else if (i < 192)
       CPPUNIT_ASSERT_EQUAL(image.get_word(0, 0), (word1 << (i-128)) | (word0 >> (192-i)));
     else