BURTON Mark
Builds for 2 pipelines passed in 13 minutes 3 seconds

Merge branch 'fix-for-mingw' into 'master'

Minor fixes for mingw

- Replaced gs_param<unsigned long long int> with gs_param<gs_uint64>
- Removed exception specification (throw) as it is now deprecated

See merge request !50
... ... @@ -706,16 +706,16 @@ inline std::string operator+ (const char *lhs, const gs_param<std::string>& rhs)
// /////////////////// gs_param< UNSIGNED LONG LONG > //////////////////////////// //
// /////////////////////////////////////////////////////////////////////////////// //
/// Template specialization for gs_param<unsigned long long int>.
/// Template specialization for gs_param<gs_uint64>.
/**
* Default value = 0.
*/
template<>
class gs_param<unsigned long long>
: public gs_param_t<unsigned long long>
class gs_param<gs_uint64>
: public gs_param_t<gs_uint64>
{
/// Typedef for the value.
typedef unsigned long long val_type;
typedef gs_uint64 val_type;
using gs_param_t<val_type>::m_locked;
using gs_param_t<val_type>::m_lock_pwd;
... ... @@ -741,7 +741,7 @@ public:
/// Overloads gs_param_base::getTypeString
const std::string getTypeString() const {
return string("unsigned long long");
return string("gs_uint64");
}
/// Overloads gs_param_base::getType
... ... @@ -771,7 +771,7 @@ public:
// if next char is a decimal point, ignore
if (!ss.eof() && ss.peek() == '.') {
target_val = tmp;
GS_PARAM_DUMP_WITHNAME("gs_param", "(unsigned long long) ignored decimal point");
GS_PARAM_DUMP_WITHNAME("gs_param", "(gs_uint64) ignored decimal point");
return true;
}
// if error try hex
... ... @@ -871,10 +871,10 @@ public:
ss.clear(); ss.str(str);
ss >> (std::hex) >> tmp;
}
// if still error try deserialize to unsigned long long
// if still error try deserialize to gs_uint64
if (!ss.eof() || ss.fail() || ss.bad()) {
ss.clear(); ss.str(str);
unsigned long long ulltmp;
gs_uint64 ulltmp;
ss >> ulltmp;
if (!ss.eof() || ss.fail() || ss.bad()) {
ss.clear(); ss.str(str);
... ...
... ... @@ -159,7 +159,7 @@ namespace cnf {
* @param argc The argc of main(...).
* @param argv The argv of main(...).
*/
void parseCommandLine(const int argc, const char* const* argv) throw(CommandLineException) {
void parseCommandLine(const int argc, const char* const* argv) /* throw(CommandLineException) */ {
#ifdef USE_GETOPT
parseCommandLineWithGetOpt(argc, argv);
#else
... ... @@ -226,7 +226,7 @@ namespace cnf {
* @param argc The argc of main(...).
* @param argv The argv of main(...).
*/
void parseCommandLineWithGetOpt(const int argc, const char* const* argv) throw(CommandLineException) {
void parseCommandLineWithGetOpt(const int argc, const char* const* argv) /* throw(CommandLineException) */ {
GCNF_DUMP_N(name(), "Parse command line for --gs_luafile option ("<<argc<<" arguments)");
// getopt permutes argv array, so copy it to argv_cp
... ...