diff --git a/include/date/date.h b/include/date/date.h index c77273e..a7e0849 100644 --- a/include/date/date.h +++ b/include/date/date.h @@ -3694,21 +3694,6 @@ struct static_pow10<0> static CONSTDATA std::uint64_t value = 1; }; -template -struct make_precision -{ - using type = std::chrono::duration::value>>; - static CONSTDATA unsigned width = w; -}; - -template -struct make_precision -{ - using type = std::chrono::duration; - static CONSTDATA unsigned width = 6; -}; - template class decimal_format_seconds { diff --git a/test/date_test/detail/decimal_format_seconds.pass.cpp b/test/date_test/detail/decimal_format_seconds.pass.cpp index cc8e3cd..9491b93 100644 --- a/test/date_test/detail/decimal_format_seconds.pass.cpp +++ b/test/date_test/detail/decimal_format_seconds.pass.cpp @@ -20,16 +20,16 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -// template ::type::period::den>::value> +// template // class decimal_format_seconds // { +// using CT = typename std::common_type::type; +// using rep = typename CT::rep; // public: -// using precision = typename make_precision::type; -// static auto constexpr width = make_precision::width; -// +// static unsigned constexpr width = detail::width::value < 19 ? +// detail::width::value : 6u; +// using precision = std::chrono::duration::value>>; // private: // std::chrono::seconds s_; // precision sub_s_; diff --git a/test/date_test/detail/make_precision.pass.cpp b/test/date_test/detail/make_precision.pass.cpp deleted file mode 100644 index efdec1c..0000000 --- a/test/date_test/detail/make_precision.pass.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2017 Howard Hinnant -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -// template -// struct make_precision -// { -// using type = std::chrono::duration::value>>; -// static constexpr unsigned width = w; -// }; - -#include "date.h" - -#include -#include - -int -main() -{ - using namespace date::detail; - using namespace std; - using namespace std::chrono; - - static_assert(make_precision::width == 0, ""); - static_assert(is_same::type, duration>>{}, ""); - - static_assert(make_precision::width == 1, ""); - static_assert(is_same::type, duration>>{}, ""); - - static_assert(make_precision::width == 2, ""); - static_assert(is_same::type, duration>>{}, ""); - - static_assert(make_precision::width == 3, ""); - static_assert(is_same::type, duration>>{}, ""); - - static_assert(make_precision::width == 18, ""); - static_assert(is_same::type, duration>>{}, ""); - - static_assert(make_precision::width == 6, ""); - static_assert(is_same::type, microseconds>{}, ""); - - static_assert(make_precision::width == 6, ""); - static_assert(is_same::type, microseconds>{}, ""); -}