boost/crc
2
0
Fork 0
mirror of https://github.com/boostorg/crc.git synced 2026-01-19 16:12:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix crc on msvc

Browse Source 
[SVN r83212]
This commit is contained in:
Steven Watanabe
2013-02-28 22:38:48 +00:00
parent ab675f4e16
commit a8dd485837
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/crc.hpp
View File

@@ -588,7 +588,7 @@ namespace detail
// The natural reading order for division is highest digit/bit first.
// The "reflect" parameter switches this. However, building a bit mask
// for the lowest bit is the easiest....
new_dividend_bits = reflect_optionally( new_dividend_bits, not reflect,
new_dividend_bits = reflect_optionally( new_dividend_bits, !reflect,
word_length );
// Perform modulo-2 division for each new dividend input bit

30
test/crc_test2.cpp
View File

@@ -474,6 +474,12 @@ BOOST_AUTO_TEST_CASE( augmented_crc_test )
}
BOOST_AUTO_TEST_SUITE ( sub_octet_crc_tests )
// Optimal computer, via the single-run function
unsigned crc_f1( const void * buffer, std::size_t byte_count )
{
return boost::crc<3u, 0x03u, 0u, 0u, false, false>( buffer, byte_count );
}
BOOST_AUTO_TEST_CASE( sub_nybble_polynominal_test )
{
@@ -507,19 +513,22 @@ BOOST_AUTO_TEST_CASE( sub_nybble_polynominal_test )
crc_1.process_bytes( samples[3], 4u );
BOOST_CHECK_EQUAL( crc_1.checksum(), 0u );
// Optimal computer, via the single-run function
BOOST_AUTO( crc_f, &(boost::crc<3u, 0x03u, 0u, 0u, false, false>) );
BOOST_CHECK_EQUAL( crc_f(samples[ 0 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f(samples[ 1 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f(samples[ 2 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f(samples[ 3 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f1(samples[ 0 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f1(samples[ 1 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f1(samples[ 2 ], 4u), 0u );
BOOST_CHECK_EQUAL( crc_f1(samples[ 3 ], 4u), 0u );
// TODO: do similar tests with boost::augmented_crc<3, 0x03>
// (Now I think that this can't be done right now, since that function reads
// byte-wise, so the register size needs to be a multiple of CHAR_BIT.)
}
// Optimal computer, via the single-run function
unsigned crc_f2( const void * buffer, std::size_t byte_count )
{
return boost::crc<7u, 0x09u, 0u, 0u, false, false>( buffer, byte_count );
}
BOOST_AUTO_TEST_CASE( sub_octet_polynominal_test )
{
// The CRC standard is a SDH/SONET J0/J1/J2/N1/N2/TR TTI (trace message)
@@ -547,11 +556,8 @@ BOOST_AUTO_TEST_CASE( sub_octet_polynominal_test )
crc_1.process_bytes( samples[1], 16u );
BOOST_CHECK_EQUAL( crc_1.checksum(), results[1] );
// Optimal computer, via the single-run function
BOOST_AUTO( crc_f, &(boost::crc<7u, 0x09u, 0u, 0u, false, false>) );
BOOST_CHECK_EQUAL( crc_f(samples[ 0 ], 16u), results[0] );
BOOST_CHECK_EQUAL( crc_f(samples[ 1 ], 16u), results[1] );
BOOST_CHECK_EQUAL( crc_f2(samples[ 0 ], 16u), results[0] );
BOOST_CHECK_EQUAL( crc_f2(samples[ 1 ], 16u), results[1] );
// TODO: do similar tests with boost::augmented_crc<7, 0x09>
// (Now I think that this can't be done right now, since that function reads