summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhihao Yuan <zy@miator.net>2018-08-01 05:21:26 +0000
committerZhihao Yuan <zy@miator.net>2018-08-01 05:21:26 +0000
commit80f0ca024a4d979cfb703561ad54f92a609a9760 (patch)
treec24edb36ece395371e703fa2577eb481a17db222
parentdc38e97601dd5b8c4a9a520c11a03698242d916b (diff)
[libc++] Fix build failures after merging <charconv>
Summary: - fix a stupid unit test typo - add <charconv> symbols to Linux abilist Reviewers: EricWF Subscribers: christof, ldionne, cfe-commits Differential Revision: https://reviews.llvm.org/D50130 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@338486 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/abi/x86_64-unknown-linux-gnu.v1.abilist2
-rw-r--r--test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp1
-rw-r--r--test/support/charconv_test_helpers.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/lib/abi/x86_64-unknown-linux-gnu.v1.abilist b/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
index c883a593e..833342ca8 100644
--- a/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
+++ b/lib/abi/x86_64-unknown-linux-gnu.v1.abilist
@@ -1192,6 +1192,8 @@
{'name': '_ZNSt3__15wclogE', 'is_defined': True, 'type': 'OBJECT', 'size': 160}
{'name': '_ZNSt3__15wcoutE', 'is_defined': True, 'type': 'OBJECT', 'size': 160}
{'name': '_ZNSt3__16__clocEv', 'is_defined': True, 'type': 'FUNC'}
+{'name': '_ZNSt3__16__itoa8__u64toaEmPc', 'is_defined': True, 'type': 'FUNC'}
+{'name': '_ZNSt3__16__itoa8__u32toaEjPc', 'is_defined': True, 'type': 'FUNC'}
{'name': '_ZNSt3__16__sortIRNS_6__lessIaaEEPaEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'}
{'name': '_ZNSt3__16__sortIRNS_6__lessIccEEPcEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'}
{'name': '_ZNSt3__16__sortIRNS_6__lessIddEEPdEEvT0_S5_T_', 'is_defined': True, 'type': 'FUNC'}
diff --git a/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp b/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
index e5a93b497..3fc533a77 100644
--- a/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
+++ b/test/std/utilities/charconv/charconv.from.chars/integral.pass.cpp
@@ -37,6 +37,7 @@ struct test_basics : roundtrip_test_base<T>
using xl = std::numeric_limits<T>;
test(1, b);
+ test(-1, b);
test(xl::lowest(), b);
test((xl::max)(), b);
test((xl::max)() / 2, b);
diff --git a/test/support/charconv_test_helpers.h b/test/support/charconv_test_helpers.h
index df1b00a67..1560fa79a 100644
--- a/test/support/charconv_test_helpers.h
+++ b/test/support/charconv_test_helpers.h
@@ -178,7 +178,7 @@ struct roundtrip_test_base
{
assert(x == 0xc);
assert(r2.ptr == buf);
- assert(r.ec == std::errc::invalid_argument);
+ assert(r2.ec == std::errc::invalid_argument);
}
else
{