mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2026-06-11 10:18:50 -04:00
Merging from trunk:
------------------------------------------------------------------------ r7896 | bsomervi | 2017-07-16 15:32:28 +0100 (Sun, 16 Jul 2017) | 5 lines Improve support for older C++ compilers Some current Linux distributions are still using GCC 4.6 which has no/poor C++11 support. probably more of this needed if we are to support such compilers. ------------------------------------------------------------------------ r7897 | bsomervi | 2017-07-16 15:32:48 +0100 (Sun, 16 Jul 2017) | 3 lines Improved rig control start up behavour Avoid trying to set bogus uninitialized frequency values. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7898 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
+10
-3
@@ -1,4 +1,5 @@
|
||||
#include <boost/crc.hpp>
|
||||
#include <boost/config.hpp>
|
||||
|
||||
extern "C"
|
||||
{
|
||||
@@ -6,19 +7,25 @@ extern "C"
|
||||
bool crc12_check (unsigned char const * data, int length);
|
||||
}
|
||||
|
||||
#define POLY 0xc06
|
||||
|
||||
#ifdef BOOST_NO_CXX11_CONSTEXPR
|
||||
#define TRUNCATED_POLYNOMIAL POLY
|
||||
#else
|
||||
namespace
|
||||
{
|
||||
unsigned long constexpr truncated_polynomial = 0xc06;
|
||||
unsigned long constexpr TRUNCATED_POLYNOMIAL = POLY;
|
||||
}
|
||||
#endif
|
||||
|
||||
// assumes CRC is last 16 bits of the data and is set to zero
|
||||
// caller should assign the returned CRC into the message in big endian byte order
|
||||
short crc12 (unsigned char const * data, int length)
|
||||
{
|
||||
return boost::augmented_crc<12, truncated_polynomial> (data, length);
|
||||
return boost::augmented_crc<12, TRUNCATED_POLYNOMIAL> (data, length);
|
||||
}
|
||||
|
||||
bool crc12_check (unsigned char const * data, int length)
|
||||
{
|
||||
return !boost::augmented_crc<12, truncated_polynomial> (data, length);
|
||||
return !boost::augmented_crc<12, TRUNCATED_POLYNOMIAL> (data, length);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user