Skip to content

Commit 6c9071f

Browse files
authored
Merge pull request #941 from cppalliance/940
2 parents 5ce4052 + 8f7074a commit 6c9071f

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

doc/modules/ROOT/pages/conversions.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ constexpr decimal128_t from_bid_d128f(unsigned __int128 bits) noexcept;
6969
template <typename T>
7070
constexpr auto to_bid(T val) noexcept;
7171
72-
template <typename T = decimal_fast32_t>
72+
template <typename T = decimal32_t>
7373
constexpr T from_bid(std::uint32_t bits) noexcept;
7474
75-
template <typename T = decimal_fast64_t>
75+
template <typename T = decimal64_t>
7676
constexpr T from_bid(std::uint64_t bits) noexcept;
7777
7878
template <typename T = decimal128_t>
@@ -95,17 +95,17 @@ constexpr detail::uint128 to_dpd_d128f(decimal_fast128_t val) noexcept;
9595
template <typename T>
9696
constexpr auto to_dpd(T val) noexcept;
9797
98-
template <typename T = decimal_fast32_t>
98+
template <typename T = decimal32_t>
9999
constexpr T from_dpd(std::uint32_t bits) noexcept;
100100
101-
template <typename T = decimal_fast64_t>
101+
template <typename T = decimal64_t>
102102
constexpr T from_dpd(std::uint64_t bits) noexcept;
103103
104-
template <typename T = decimal_fast128_t>
104+
template <typename T = decimal128_t>
105105
constexpr T from_dpd(detail::uint128 bits) noexcept;
106106
107107
#ifdef BOOST_DECIMAL_HAS_INT128
108-
template <typename T = decimal_fast128_t>
108+
template <typename T = decimal128_t>
109109
constexpr T from_dpd(unsigned __int128 bits) noexcept;
110110
#endif
111111

include/boost/decimal/bid_conversion.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,43 +143,43 @@ constexpr auto to_bid(T val) noexcept
143143
return to_bid(val);
144144
}
145145

146-
BOOST_DECIMAL_EXPORT template <typename T = decimal_fast32_t>
146+
BOOST_DECIMAL_EXPORT template <typename T = decimal32_t>
147147
constexpr auto from_bid(std::uint32_t bits) noexcept
148148
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, T)
149149
{
150-
return from_bid_d32f(bits);
150+
return from_bid_d32(bits);
151151
}
152152

153153
BOOST_DECIMAL_EXPORT template <>
154-
constexpr auto from_bid<decimal32_t>(std::uint32_t bits) noexcept -> decimal32_t
154+
constexpr auto from_bid<decimal_fast32_t>(std::uint32_t bits) noexcept -> decimal_fast32_t
155155
{
156-
return from_bid_d32(bits);
156+
return from_bid_d32f(bits);
157157
}
158158

159-
BOOST_DECIMAL_EXPORT template <typename T = decimal_fast64_t>
159+
BOOST_DECIMAL_EXPORT template <typename T = decimal64_t>
160160
constexpr auto from_bid(std::uint64_t bits) noexcept
161161
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, T)
162162
{
163-
return from_bid_d64f(bits);
163+
return from_bid_d64(bits);
164164
}
165165

166166
BOOST_DECIMAL_EXPORT template <>
167-
constexpr auto from_bid<decimal64_t>(std::uint64_t bits) noexcept -> decimal64_t
167+
constexpr auto from_bid<decimal_fast64_t>(std::uint64_t bits) noexcept -> decimal_fast64_t
168168
{
169-
return from_bid_d64(bits);
169+
return from_bid_d64f(bits);
170170
}
171171

172-
BOOST_DECIMAL_EXPORT template <typename T = decimal_fast128_t>
172+
BOOST_DECIMAL_EXPORT template <typename T = decimal128_t>
173173
constexpr auto from_bid(int128::uint128_t bits) noexcept
174174
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, T)
175175
{
176-
return from_bid_d128f(bits);
176+
return from_bid_d128(bits);
177177
}
178178

179179
BOOST_DECIMAL_EXPORT template <>
180-
constexpr auto from_bid<decimal128_t>(int128::uint128_t bits) noexcept -> decimal128_t
180+
constexpr auto from_bid<decimal_fast128_t>(int128::uint128_t bits) noexcept -> decimal_fast128_t
181181
{
182-
return from_bid_d128(bits);
182+
return from_bid_d128f(bits);
183183
}
184184

185185
#if defined(__GNUC__) && __GNUC__ == 7

include/boost/decimal/dpd_conversion.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -954,21 +954,21 @@ constexpr auto to_dpd(DecimalType val) noexcept
954954
return to_dpd(val);
955955
}
956956

957-
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal_fast32_t>
957+
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal32_t>
958958
constexpr auto from_dpd(std::uint32_t bits) noexcept
959959
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, DecimalType)
960960
{
961961
return from_dpd_d32<DecimalType>(bits);
962962
}
963963

964-
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal_fast64_t>
964+
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal64_t>
965965
constexpr auto from_dpd(std::uint64_t bits) noexcept
966966
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, DecimalType)
967967
{
968968
return from_dpd_d64<DecimalType>(bits);
969969
}
970970

971-
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal_fast128_t>
971+
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal128_t>
972972
constexpr auto from_dpd(int128::uint128_t bits) noexcept
973973
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, DecimalType)
974974
{
@@ -977,7 +977,7 @@ constexpr auto from_dpd(int128::uint128_t bits) noexcept
977977

978978
#ifdef BOOST_DECIMAL_HAS_INT128
979979

980-
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal_fast128_t>
980+
BOOST_DECIMAL_EXPORT template <typename DecimalType = decimal128_t>
981981
constexpr auto from_dpd(detail::builtin_uint128_t bits) noexcept
982982
BOOST_DECIMAL_REQUIRES(detail::is_decimal_floating_point_v, DecimalType)
983983
{

0 commit comments

Comments
 (0)