mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2025-02-09 09:53:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add std:: for <cstdint> types

Browse source
This commit is contained in:
bolero-MURAKAMI 2014-03-26 11:57:33 +09:00
parent 5baa0580d8
commit 11a96da4bb
9 changed files with 442 additions and 438 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libs/net/test/endian.cpp
View file

@ -11,6 +11,7 @@
#ifndef SPROUT_LIBS_NET_TEST_ENDIAN_CPP #ifndef SPROUT_LIBS_NET_TEST_ENDIAN_CPP
#define SPROUT_LIBS_NET_TEST_ENDIAN_CPP #define SPROUT_LIBS_NET_TEST_ENDIAN_CPP
#include <cstdint>
#include <sprout/net/endian.hpp> #include <sprout/net/endian.hpp>
#include <testspr/tools.hpp> #include <testspr/tools.hpp>
@ -19,24 +20,24 @@ namespace testspr {
using namespace sprout; using namespace sprout;
{ // 16 { // 16
TESTSPR_ASSERT(sprout::net::detail::reverse(uint16_t(0x0A1B)) == uint16_t(0x1B0A)); TESTSPR_ASSERT(sprout::net::detail::reverse(std::uint16_t(0x0A1B)) == std::uint16_t(0x1B0A));
TESTSPR_ASSERT(sprout::net::detail::reverse(uint16_t(0x1B0A)) == uint16_t(0x0A1B)); TESTSPR_ASSERT(sprout::net::detail::reverse(std::uint16_t(0x1B0A)) == std::uint16_t(0x0A1B));
TESTSPR_ASSERT(sprout::net::detail::reverse_words(uint16_t(0x0A1B)) == uint16_t(0x1B0A)); TESTSPR_ASSERT(sprout::net::detail::reverse_words(std::uint16_t(0x0A1B)) == std::uint16_t(0x1B0A));
TESTSPR_ASSERT(sprout::net::detail::reverse_words(uint16_t(0x1B0A)) == uint16_t(0x0A1B)); TESTSPR_ASSERT(sprout::net::detail::reverse_words(std::uint16_t(0x1B0A)) == std::uint16_t(0x0A1B));
} }
{ // 32 { // 32
TESTSPR_ASSERT(sprout::net::detail::reverse(uint32_t(0x0A1B2C3D)) == uint32_t(0x3D2C1B0A)); TESTSPR_ASSERT(sprout::net::detail::reverse(std::uint32_t(0x0A1B2C3D)) == std::uint32_t(0x3D2C1B0A));
TESTSPR_ASSERT(sprout::net::detail::reverse(uint32_t(0x3D2C1B0A)) == uint32_t(0x0A1B2C3D)); TESTSPR_ASSERT(sprout::net::detail::reverse(std::uint32_t(0x3D2C1B0A)) == std::uint32_t(0x0A1B2C3D));
TESTSPR_ASSERT(sprout::net::detail::reverse_words(uint32_t(0x0A1B2C3D)) == uint32_t(0x1B0A3D2C)); TESTSPR_ASSERT(sprout::net::detail::reverse_words(std::uint32_t(0x0A1B2C3D)) == std::uint32_t(0x1B0A3D2C));
TESTSPR_ASSERT(sprout::net::detail::reverse_words(uint32_t(0x1B0A3D2C)) == uint32_t(0x0A1B2C3D)); TESTSPR_ASSERT(sprout::net::detail::reverse_words(std::uint32_t(0x1B0A3D2C)) == std::uint32_t(0x0A1B2C3D));
} }
{ // 64 { // 64
TESTSPR_ASSERT(sprout::net::detail::reverse(uint64_t(0x0A1B2C3D4E5F6A7B)) == uint64_t(0x7B6A5F4E3D2C1B0A)); TESTSPR_ASSERT(sprout::net::detail::reverse(std::uint64_t(0x0A1B2C3D4E5F6A7B)) == std::uint64_t(0x7B6A5F4E3D2C1B0A));
TESTSPR_ASSERT(sprout::net::detail::reverse(uint64_t(0x7B6A5F4E3D2C1B0A)) == uint64_t(0x0A1B2C3D4E5F6A7B)); TESTSPR_ASSERT(sprout::net::detail::reverse(std::uint64_t(0x7B6A5F4E3D2C1B0A)) == std::uint64_t(0x0A1B2C3D4E5F6A7B));
TESTSPR_ASSERT(sprout::net::detail::reverse_words(uint64_t(0x0A1B2C3D4E5F6A7B)) == uint64_t(0x1B0A3D2C5F4E7B6A)); TESTSPR_ASSERT(sprout::net::detail::reverse_words(std::uint64_t(0x0A1B2C3D4E5F6A7B)) == std::uint64_t(0x1B0A3D2C5F4E7B6A));
TESTSPR_ASSERT(sprout::net::detail::reverse_words(uint64_t(0x1B0A3D2C5F4E7B6A)) == uint64_t(0x0A1B2C3D4E5F6A7B)); TESTSPR_ASSERT(sprout::net::detail::reverse_words(std::uint64_t(0x1B0A3D2C5F4E7B6A)) == std::uint64_t(0x0A1B2C3D4E5F6A7B));
} }
} }
} // namespace testspr } // namespace testspr

32
sprout/net/endian.hpp
View file

@ -8,8 +8,8 @@
Distributed under the Boost Software License, Version 1.0. (See accompanying Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/ =============================================================================*/
#ifndef SPROUT_NET_NET_HPP #ifndef SPROUT_NET_ENDIAN_HPP
#define SPROUT_NET_NET_HPP #define SPROUT_NET_ENDIAN_HPP
#include <cstdint> #include <cstdint>
#include <sprout/config.hpp> #include <sprout/config.hpp>
@ -23,7 +23,7 @@ namespace sprout {
* Left shift 'val' by 'n' bytes * Left shift 'val' by 'n' bytes
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T lshift_by(T val, uint_fast8_t n) { SPROUT_CONSTEXPR T lshift_by(T val, std::uint_fast8_t n) {
return val << (n * 8); return val << (n * 8);
} }
@ -32,7 +32,7 @@ namespace sprout {
* Right shift 'val' by 'n' bytes * Right shift 'val' by 'n' bytes
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T rshift_by(T val, uint_fast8_t n) { SPROUT_CONSTEXPR T rshift_by(T val, std::uint_fast8_t n) {
return val >> (n * 8); return val >> (n * 8);
} }
@ -41,7 +41,7 @@ namespace sprout {
* Mask 'n'th byte * Mask 'n'th byte
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T mask_at(uint_fast8_t n) { SPROUT_CONSTEXPR T mask_at(std::uint_fast8_t n) {
return lshift_by(T(0xFF), n); return lshift_by(T(0xFF), n);
} }
@ -50,7 +50,7 @@ namespace sprout {
* Get 'n'th byte from 'val' * Get 'n'th byte from 'val'
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T byte_at(T val, uint_fast8_t n) { SPROUT_CONSTEXPR T byte_at(T val, std::uint_fast8_t n) {
return rshift_by((val & mask_at<T>(n)), n); return rshift_by((val & mask_at<T>(n)), n);
} }
@ -59,7 +59,7 @@ namespace sprout {
* Replace, in 'val', 'n'th byte with 'byte_val' * Replace, in 'val', 'n'th byte with 'byte_val'
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T replace_at(T val, uint8_t byte_val, uint_fast8_t n) { SPROUT_CONSTEXPR T replace_at(T val, std::uint8_t byte_val, std::uint_fast8_t n) {
return (val & ~mask_at<T>(n)) | lshift_by(T(byte_val), n); return (val & ~mask_at<T>(n)) | lshift_by(T(byte_val), n);
} }
@ -68,7 +68,7 @@ namespace sprout {
* Copy, in 'val', byte at index 'from' to byte at index 'to' * Copy, in 'val', byte at index 'from' to byte at index 'to'
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T copy(T val, uint_fast8_t from, uint_fast8_t to) { SPROUT_CONSTEXPR T copy(T val, std::uint_fast8_t from, std::uint_fast8_t to) {
return replace_at(val, byte_at(val, from), to); return replace_at(val, byte_at(val, from), to);
} }
@ -77,7 +77,7 @@ namespace sprout {
* Swap, in 'val', byte at index 'n1' with byte at index 'n2' * Swap, in 'val', byte at index 'n1' with byte at index 'n2'
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T swap(T val, uint_fast8_t n1, uint_fast8_t n2) { SPROUT_CONSTEXPR T swap(T val, std::uint_fast8_t n1, std::uint_fast8_t n2) {
return replace_at(copy(val, n1, n2), byte_at(val, n2), n1); return replace_at(copy(val, n1, n2), byte_at(val, n2), n1);
} }
@ -86,7 +86,7 @@ namespace sprout {
* Swap, in 'val', byte at index 'n1' with byte at index 'n2' in 'val', increment n1, decrement n2 until n1 > n2 * Swap, in 'val', byte at index 'n1' with byte at index 'n2' in 'val', increment n1, decrement n2 until n1 > n2
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T reverse_impl(T val, uint_fast8_t n1, uint_fast8_t n2) { SPROUT_CONSTEXPR T reverse_impl(T val, std::uint_fast8_t n1, std::uint_fast8_t n2) {
return n1 > n2 ? val : reverse_impl(swap(val, n1, n2), n1 + 1, n2 - 1); return n1 > n2 ? val : reverse_impl(swap(val, n1, n2), n1 + 1, n2 - 1);
} }
@ -104,7 +104,7 @@ namespace sprout {
* Swap, in 'val', byte at index 'n' - 1 with byte at index 'n' - 2, decrement n by 2 until n == 0 * Swap, in 'val', byte at index 'n' - 1 with byte at index 'n' - 2, decrement n by 2 until n == 0
*/ */
template<typename T> template<typename T>
SPROUT_CONSTEXPR T reverse_words_impl(T val, uint_fast8_t n) { SPROUT_CONSTEXPR T reverse_words_impl(T val, std::uint_fast8_t n) {
return n == 0 ? val : reverse_words_impl(swap(val, n - 1, n - 2), n - 2); return n == 0 ? val : reverse_words_impl(swap(val, n - 1, n - 2), n - 2);
} }
@ -148,28 +148,28 @@ namespace sprout {
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf
// uint32_t htonl(uint32_t host32) // uint32_t htonl(uint32_t host32)
SPROUT_CONSTEXPR uint32_t htonl(uint32_t host32) { SPROUT_CONSTEXPR std::uint32_t htonl(std::uint32_t host32) {
return hton(host32); return hton(host32);
} }
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf
// uint16_t htons(uint16_t host16) // uint16_t htons(uint16_t host16)
SPROUT_CONSTEXPR uint16_t htons(uint16_t host16) { SPROUT_CONSTEXPR std::uint16_t htons(std::uint16_t host16) {
return hton(host16); return hton(host16);
} }
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf
// uint32_t ntohl(uint32_t net32) // uint32_t ntohl(uint32_t net32)
SPROUT_CONSTEXPR uint32_t ntohl(uint32_t net32) { SPROUT_CONSTEXPR std::uint32_t ntohl(std::uint32_t net32) {
return ntoh(net32); return ntoh(net32);
} }
// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2013/n3620.pdf
// uint16_t ntohs(uint32_t net16) // uint16_t ntohs(uint32_t net16)
SPROUT_CONSTEXPR uint16_t ntohs(uint16_t net16) { SPROUT_CONSTEXPR std::uint16_t ntohs(std::uint16_t net16) {
return ntoh(net16); return ntoh(net16);
} }
} //namespace net } //namespace net
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_NET_NET_HPP #endif // #ifndef SPROUT_NET_ENDIAN_HPP

1
testspr/header_all.hpp
View file

@ -46,6 +46,7 @@
#include <sprout/limits.hpp> #include <sprout/limits.hpp>
#include <sprout/logic.hpp> #include <sprout/logic.hpp>
#include <sprout/math.hpp> #include <sprout/math.hpp>
#include <sprout/net.hpp>
#include <sprout/none.hpp> #include <sprout/none.hpp>
#include <sprout/numeric.hpp> #include <sprout/numeric.hpp>
#include <sprout/numeric/dft.hpp> #include <sprout/numeric/dft.hpp>

2
testspr/sprout.cpp
View file

@ -23,6 +23,7 @@
#include "../libs/random/test/random.cpp" #include "../libs/random/test/random.cpp"
#include "../libs/utility/string_ref/test/string_ref.cpp" #include "../libs/utility/string_ref/test/string_ref.cpp"
#include "../libs/cstring/test/cstring.cpp" #include "../libs/cstring/test/cstring.cpp"
#include "../libs/net/test/endian.cpp"
#ifdef TESTSPR_CPP_INCLUDE_DISABLE_TESTSPR_SPROUT_HPP #ifdef TESTSPR_CPP_INCLUDE_DISABLE_TESTSPR_SPROUT_HPP
# undef TESTSPR_CPP_INCLUDE # undef TESTSPR_CPP_INCLUDE
@ -40,6 +41,7 @@ namespace testspr {
testspr::random_test(); testspr::random_test();
testspr::string_ref_test(); testspr::string_ref_test();
testspr::cstring_test(); testspr::cstring_test();
testspr::endian_test();
} }
} // namespace testspr } // namespace testspr