w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7896 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-07-16 14:32:28 +00:00
parent d50f3a009d
commit 29fc1719a9
2 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/crc10.cpp
View File

@ -1,24 +1,31 @@
#include <boost/crc.hpp> #include <boost/crc.hpp>
#include <boost/config.hpp>
extern "C"
{ extern "C"
short crc10 (unsigned char const * data, int length); {
bool crc10_check (unsigned char const * data, int length); short crc10 (unsigned char const * data, int length);
} bool crc10_check (unsigned char const * data, int length);
}
namespace
{ #define POLY 0x08f
unsigned long constexpr truncated_polynomial = 0x08f;
} #ifdef BOOST_NO_CXX11_CONSTEXPR
#define TRUNCATED_POLYNOMIAL POLY
// assumes CRC is last 16 bits of the data and is set to zero #else
// caller should assign the returned CRC into the message in big endian byte order namespace
short crc10 (unsigned char const * data, int length) {
{ unsigned long constexpr TRUNCATED_POLYNOMIAL = POLY;
return boost::augmented_crc<10, truncated_polynomial> (data, length); }
} #endif
bool crc10_check (unsigned char const * data, int length) // 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
return !boost::augmented_crc<10, truncated_polynomial> (data, length); short crc10 (unsigned char const * data, int length)
} {
return boost::augmented_crc<10, TRUNCATED_POLYNOMIAL> (data, length);
}
bool crc10_check (unsigned char const * data, int length)
{
return !boost::augmented_crc<10, TRUNCATED_POLYNOMIAL> (data, length);
}

13
lib/crc12.cpp
View File

@ -1,4 +1,5 @@
#include <boost/crc.hpp> #include <boost/crc.hpp>
#include <boost/config.hpp>
extern "C" extern "C"
{ {
@ -6,19 +7,25 @@ extern "C"
bool crc12_check (unsigned char const * data, int length); bool crc12_check (unsigned char const * data, int length);
} }
#define POLY 0xc06
#ifdef BOOST_NO_CXX11_CONSTEXPR
#define TRUNCATED_POLYNOMIAL POLY
#else
namespace 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 // 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 // caller should assign the returned CRC into the message in big endian byte order
short crc12 (unsigned char const * data, int length) 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) 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);
} }