compatible to g++11 / QT5

method suggested by cyril
This commit is contained in:
zeners 2016-03-29 21:22:14 +02:00
parent 5783c59463
commit aca88308ea
9 changed files with 27 additions and 11 deletions

View file

@ -25,6 +25,8 @@
#include "pqiqosstreamer.h"
const float pqiQoSstreamer::PQI_QOS_STREAMER_ALPHA = 2.0f ;
pqiQoSstreamer::pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin)
: pqithreadstreamer(parent,rss,peerid,bio_in,bio_flagsin), pqiQoS(PQI_QOS_STREAMER_MAX_LEVELS, PQI_QOS_STREAMER_ALPHA)
{

View file

@ -34,7 +34,7 @@ class pqiQoSstreamer: public pqithreadstreamer, public pqiQoS
pqiQoSstreamer(PQInterface *parent, RsSerialiser *rss, const RsPeerId& peerid, BinInterface *bio_in, int bio_flagsin);
static const uint32_t PQI_QOS_STREAMER_MAX_LEVELS = 10 ;
static const float PQI_QOS_STREAMER_ALPHA = 2.0 ;
static const float PQI_QOS_STREAMER_ALPHA ;
virtual void locked_storeInOutputQueue(void *ptr,int priority) ;
virtual int locked_out_queue_size() const { return _total_item_count ; }

View file

@ -31,8 +31,8 @@
class RsReputations
{
public:
static const float REPUTATION_THRESHOLD_ANTI_SPAM = 1.4f ;
static const float REPUTATION_THRESHOLD_DEFAULT = 1.0f ;
static const float REPUTATION_THRESHOLD_ANTI_SPAM;
static const float REPUTATION_THRESHOLD_DEFAULT;
// This is the interface file for the reputation system
//

View file

@ -69,6 +69,10 @@ static double getCurrentTS()
return cts;
}
const double RsServer::minTimeDelta = 0.1; // 25;
const double RsServer::maxTimeDelta = 0.5;
const double RsServer::kickLimit = 0.15;
RsServer::RsServer()
: coreMutex("RsServer")

View file

@ -194,9 +194,9 @@ class RsServer: public RsControl, public RsTickingThread
double mAvgTickRate ;
double mTimeDelta ;
static const double minTimeDelta = 0.1; // 25;
static const double maxTimeDelta = 0.5;
static const double kickLimit = 0.15;
static const double minTimeDelta; // 25;
static const double maxTimeDelta;
static const double kickLimit;
};
/* Helper function to convert windows paths

View file

@ -303,6 +303,10 @@ void p3GxsReputation::updateActiveFriends()
}
const float RsReputations::REPUTATION_THRESHOLD_ANTI_SPAM = 1.4f ;
const float RsReputations::REPUTATION_THRESHOLD_DEFAULT = 1.0f ;
static RsReputations::Opinion safe_convert_uint32t_to_opinion(uint32_t op)
{
return RsReputations::Opinion(std::min((uint32_t)op,UPPER_LIMIT)) ;