Changeset 3ae7827 in mainline

Timestamp:

2018-07-05T21:41:25Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1caddc6

Parents:

07eaeea

git-author:

Dzejrou <dzejrou@…> (2018-07-03 18:40:07)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:25)

Message:

cpp: fixed a bug in bitset test which caused endianity to change result of the test

Location:

uspace/lib/cpp

Files:

• include/__bits/adt/bitset.hpp (modified) (1 diff)
• src/__bits/test/bitset.cpp (modified) (1 diff)

uspace/lib/cpp/include/__bits/adt/bitset.hpp

@@ -270 +270 @@
             {
                 // TODO: throw overflow_error if N > bits in ulong
-                return static_cast<unsigned long>(data_[0] & (~0UL));
+                return static_cast<unsigned long>(data_[0]);
             }
 

uspace/lib/cpp/src/__bits/test/bitset.cpp

@@ -92 +92 @@
         );
 
-        std::bitset<64> b4{0xABCD'DCBA'DEAD'BEEF};
+        std::bitset<64> b4{0xABCD'DCBA'DEAD'BEEFULL};
         test_eq(
             "from hex to number equivalence",
-            b4.to_ulong(), 0xABCD'DCBA'DEAD'BEEF
+            b4.to_ulong(), static_cast<unsigned long>(0xABCD'DCBA'DEAD'BEEFULL)
         );