1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 36054278304945c6aef7d44e58788ca882c67d05 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 1 Sep 2022 15:54:13 -0700
Subject: [PATCH] sandbox: Do not use int8_t in std::uniform_int_distribution
Newer versions of libc++ has dropped supporting this usecase since its
an UB see.
https://reviews.llvm.org/D114920?id=400571
Fixes
uniform_int_distribution.h:162:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_inttype<char>::value': IntType must be a supported integer type
static_assert(__libcpp_random_is_valid_inttype<_IntType>::value, "IntType must be a supported integer type");
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: note: in instantiation of template class 'std::uniform_int_distribution<char>' requested here
c = std::uniform_int_distribution<char>(' ', '~')(gen);
^
/mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/libcereal/1.3.2+gitAUTOINC+ebef1e9298-r0/git/sandbox/performance.cpp:261:9: error: type 'std::uniform_int_distribution<char>' does not provide a call operator
c = std::uniform_int_distribution<char>(' ', '~')(gen);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/764]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
sandbox/performance.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sandbox/performance.cpp b/sandbox/performance.cpp
index f9307870..aca8c78c 100644
--- a/sandbox/performance.cpp
+++ b/sandbox/performance.cpp
@@ -258,7 +258,7 @@ random_value(std::mt19937 & gen)
{
std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
for(char & c : s)
- c = std::uniform_int_distribution<char>(' ', '~')(gen);
+ c = static_cast<char>( std::uniform_int_distribution<int>(' ', '~')(gen) );
return s;
}
@@ -277,7 +277,7 @@ std::string random_binary_string(std::mt19937 & gen)
{
std::string s(N, ' ');
for(auto & c : s )
- c = std::uniform_int_distribution<char>('0', '1')(gen);
+ c = static_cast<char>( std::uniform_int_distribution<int>( '0', '1' )(gen) );
return s;
}
--
2.37.3
|
