From 483c43c7326bac2fc41154dd2f3511f3cebf034e Mon Sep 17 00:00:00 2001 From: Danny Robson Date: Fri, 21 Sep 2018 12:25:02 +1000 Subject: [PATCH] algo: remove doubly qualified root namespace --- algo/sort.cpp | 2 +- algo/sort.hpp | 2 +- test/algo/sort.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/algo/sort.cpp b/algo/sort.cpp index dcbe2031..053d84bc 100644 --- a/algo/sort.cpp +++ b/algo/sort.cpp @@ -15,4 +15,4 @@ // // this particular instantiation isn't necessarily required by any user, it's // just convenient. -template void cruft::cruft::sort::soa (int*, int*, bool (*)(int,int), double*); +template void cruft::sort::soa (int*, int*, bool (*)(int,int), double*); diff --git a/algo/sort.hpp b/algo/sort.hpp index 959b667a..3a170a3d 100644 --- a/algo/sort.hpp +++ b/algo/sort.hpp @@ -19,7 +19,7 @@ #include -namespace cruft::cruft::sort { +namespace cruft::sort { namespace detail { template void diff --git a/test/algo/sort.cpp b/test/algo/sort.cpp index 8c05f902..f98efaf7 100644 --- a/test/algo/sort.cpp +++ b/test/algo/sort.cpp @@ -37,7 +37,7 @@ main (int, char**) std::array values { 3, 4, 5 }; const std::array expected = { 4, 5, 3 }; - cruft::cruft::sort::reorder ( + cruft::sort::reorder ( std::begin (indices), std::end (indices), std::begin (values) ); @@ -59,7 +59,7 @@ main (int, char**) { 9, 10, 11 }, }; - cruft::cruft::sort::reorder ( + cruft::sort::reorder ( std::begin (indices), std::end (indices), std::begin (values[0]), std::begin (values[1]), @@ -84,7 +84,7 @@ main (int, char**) }; for (auto &t: TESTS) { - cruft::cruft::sort::soa ( + cruft::sort::soa ( std::begin (t.values), std::end (t.values), [] (int a, int b) { return a < b; } ); @@ -102,7 +102,7 @@ main (int, char**) const std::array expected_c { 'b', 'c', 'a' }; const std::array expected_f { 1.f, 2.f, 0.f }; - cruft::cruft::sort::soa ( + cruft::sort::soa ( std::begin (value_i), std::end (value_i), [] (const auto &i, const auto &j) { return i < j; }, std::begin (value_c),