From 851ea6e01a3960f33a3fae43e1ff08eefb6b4d10 Mon Sep 17 00:00:00 2001 From: "Stephan T. Lavavej" Date: Wed, 13 Dec 2017 00:51:31 +0000 Subject: [libcxx] [test] Fix line endings, avoid unnecessary non-ASCII. benchmarks/util_smartptr.bench.cpp Change CRLF to LF. test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp Consistently comment "\u20ac" as EURO SIGN, its Unicode name, instead of the actual Unicode character. test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp Avoid non-ASCII dash. Fixes D40991. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@320536 91177308-0d34-0410-b5e6-96231b3b80d8 --- benchmarks/util_smartptr.bench.cpp | 84 +++++++++++----------- .../get_long_double_fr_FR.pass.cpp | 28 ++++---- .../construct_type.pass.cpp | 2 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/benchmarks/util_smartptr.bench.cpp b/benchmarks/util_smartptr.bench.cpp index 3b27d7897..ad3f03a04 100644 --- a/benchmarks/util_smartptr.bench.cpp +++ b/benchmarks/util_smartptr.bench.cpp @@ -1,42 +1,42 @@ -//===----------------------------------------------------------------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// - -#include - -#include "benchmark/benchmark_api.h" - -static void BM_SharedPtrCreateDestroy(benchmark::State& st) { - while (st.KeepRunning()) { - auto sp = std::make_shared(42); - benchmark::DoNotOptimize(sp.get()); - } -} -BENCHMARK(BM_SharedPtrCreateDestroy); - -static void BM_SharedPtrIncDecRef(benchmark::State& st) { - auto sp = std::make_shared(42); - benchmark::DoNotOptimize(sp.get()); - while (st.KeepRunning()) { - std::shared_ptr sp2(sp); - benchmark::ClobberMemory(); - } -} -BENCHMARK(BM_SharedPtrIncDecRef); - -static void BM_WeakPtrIncDecRef(benchmark::State& st) { - auto sp = std::make_shared(42); - benchmark::DoNotOptimize(sp.get()); - while (st.KeepRunning()) { - std::weak_ptr wp(sp); - benchmark::ClobberMemory(); - } -} -BENCHMARK(BM_WeakPtrIncDecRef); - -BENCHMARK_MAIN() +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +#include + +#include "benchmark/benchmark_api.h" + +static void BM_SharedPtrCreateDestroy(benchmark::State& st) { + while (st.KeepRunning()) { + auto sp = std::make_shared(42); + benchmark::DoNotOptimize(sp.get()); + } +} +BENCHMARK(BM_SharedPtrCreateDestroy); + +static void BM_SharedPtrIncDecRef(benchmark::State& st) { + auto sp = std::make_shared(42); + benchmark::DoNotOptimize(sp.get()); + while (st.KeepRunning()) { + std::shared_ptr sp2(sp); + benchmark::ClobberMemory(); + } +} +BENCHMARK(BM_SharedPtrIncDecRef); + +static void BM_WeakPtrIncDecRef(benchmark::State& st) { + auto sp = std::make_shared(42); + benchmark::DoNotOptimize(sp.get()); + while (st.KeepRunning()) { + std::weak_ptr wp(sp); + benchmark::ClobberMemory(); + } +} +BENCHMARK(BM_WeakPtrIncDecRef); + +BENCHMARK_MAIN() diff --git a/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp b/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp index d7ce1033a..5656f73ee 100644 --- a/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp +++ b/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_fr_FR.pass.cpp @@ -117,7 +117,7 @@ int main() assert(ex == -123456789); } { // zero, showbase - std::string v = "0,00 \u20ac"; // € + std::string v = "0,00 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -129,7 +129,7 @@ int main() assert(ex == 0); } { // zero, showbase - std::string v = "0,00 \u20ac"; // € + std::string v = "0,00 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -141,7 +141,7 @@ int main() assert(ex == 0); } { // negative one, showbase - std::string v = "-0,01 \u20ac"; + std::string v = "-0,01 \u20ac"; // EURO SIGN typedef input_iterator I; long double ex; std::ios_base::iostate err = std::ios_base::goodbit; @@ -152,7 +152,7 @@ int main() assert(ex == -1); } { // negative one, showbase - std::string v = "-0,01 \u20ac"; + std::string v = "-0,01 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -164,7 +164,7 @@ int main() assert(ex == -1); } { // positive, showbase - std::string v = "1 234 567,89 \u20ac"; + std::string v = "1 234 567,89 \u20ac"; // EURO SIGN typedef input_iterator I; long double ex; std::ios_base::iostate err = std::ios_base::goodbit; @@ -175,7 +175,7 @@ int main() assert(ex == 123456789); } { // positive, showbase - std::string v = "1 234 567,89 \u20ac"; + std::string v = "1 234 567,89 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -188,7 +188,7 @@ int main() noshowbase(ios); } { // negative, showbase - std::string v = "-1 234 567,89 \u20ac"; + std::string v = "-1 234 567,89 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -450,7 +450,7 @@ int main() assert(ex == -123456789); } { // zero, showbase - std::wstring v = L"0,00 \u20ac"; + std::wstring v = L"0,00 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -462,7 +462,7 @@ int main() assert(ex == 0); } { // zero, showbase - std::wstring v = L"0,00 \u20ac"; + std::wstring v = L"0,00 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -474,7 +474,7 @@ int main() assert(ex == 0); } { // negative one, showbase - std::wstring v = L"-0,01 \u20ac"; + std::wstring v = L"-0,01 \u20ac"; // EURO SIGN typedef input_iterator I; long double ex; std::ios_base::iostate err = std::ios_base::goodbit; @@ -485,7 +485,7 @@ int main() assert(ex == -1); } { // negative one, showbase - std::wstring v = L"-0,01 \u20ac"; + std::wstring v = L"-0,01 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -497,7 +497,7 @@ int main() assert(ex == -1); } { // positive, showbase - std::wstring v = L"1 234 567,89 \u20ac"; + std::wstring v = L"1 234 567,89 \u20ac"; // EURO SIGN typedef input_iterator I; long double ex; std::ios_base::iostate err = std::ios_base::goodbit; @@ -508,7 +508,7 @@ int main() assert(ex == 123456789); } { // positive, showbase - std::wstring v = L"1 234 567,89 \u20ac"; + std::wstring v = L"1 234 567,89 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; @@ -521,7 +521,7 @@ int main() noshowbase(ios); } { // negative, showbase - std::wstring v = L"-1 234 567,89 \u20ac"; + std::wstring v = L"-1 234 567,89 \u20ac"; // EURO SIGN showbase(ios); typedef input_iterator I; long double ex; diff --git a/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp b/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp index 8568c7380..71421464d 100644 --- a/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp +++ b/test/std/utilities/allocator.adaptor/allocator.adaptor.members/construct_type.pass.cpp @@ -26,7 +26,7 @@ #include "uses_alloc_types.hpp" #include "controlled_allocators.hpp" -// — If uses_allocator_v is false and +// - If uses_allocator_v is false and // is_constructible_v is true, calls // OUTERMOST_ALLOC_TRAITS(*this)::construct( // OUTERMOST (*this), p, std::forward(args)...). -- cgit v1.2.3