LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problems with r'890 when building on machines where sizeof(size_t) != sizeof(unsigned long long) and C++03

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@319106 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow
2017-11-27 22:27:22 +00:00
parent 3a968efeeb
commit 06f2e0050f
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp
View File

@@ -8,6 +8,7 @@
//===----------------------------------------------------------------------===//
// test unsigned long long to_ullong() const;
extern "C" int printf(const char *, ...);
#include <bitset>
#include <algorithm>
@@ -37,7 +38,7 @@ void test_to_ullong()
assert(j == v.to_ullong());
}
{ // test values bigger than can fit into the bitset
const unsigned long long val = 0xAAAAAAAAAAAAAAAAULL;
const unsigned long long val = 0x55AAAAFFFFAAAA55ULL;
const bool canFit = N < sizeof(unsigned long long) * CHAR_BIT;
const unsigned long long mask = canFit ? (1ULL << N) - 1 : (unsigned long long)(-1);
std::bitset<N> v(val);

6
test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp
View File

@@ -16,12 +16,9 @@
#include <climits>
#include <cassert>
#include <iostream>
template <std::size_t N>
void test_to_ulong()
{
std::cout << "Testing size = " << N << std::endl;
const std::size_t M = sizeof(unsigned long) * CHAR_BIT < N ? sizeof(unsigned long) * CHAR_BIT : N;
const bool is_M_zero = std::integral_constant<bool, M == 0>::value; // avoid compiler warnings
const std::size_t X = is_M_zero ? sizeof(unsigned long) * CHAR_BIT - 1 : sizeof(unsigned long) * CHAR_BIT - M;
@@ -37,13 +34,12 @@ void test_to_ulong()
for (std::size_t i = 0; i < sizeof(tests)/sizeof(tests[0]); ++i)
{
std::size_t j = tests[i];
std::cout << " Testing value = " << j << std::endl;
std::bitset<N> v(j);
assert(j == v.to_ulong());
}
{ // test values bigger than can fit into the bitset
const unsigned long val = 0xAAAAAAAAULL;
const unsigned long val = 0x5AFFFFA5ULL;
const bool canFit = N < sizeof(unsigned long) * CHAR_BIT;
const unsigned long mask = canFit ? (1ULL << N) - 1 : (unsigned long)(-1);
std::bitset<N> v(val);