retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed a GCC 6 build error: C++11 requires a space between literal and string macro. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6084 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2016-01-20 10:23:35 +00:00
parent c68db49d5d
commit 3aeb6687d5
11 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/server/cpuload.cpp
View File

@ -375,7 +375,8 @@ void Cpu::updateYateLoad()
bool updateLoad = true; bool updateLoad = true;
if (user < m_yateUser || ker < m_yateSystem || time < m_lastYateCheck) { if (user < m_yateUser || ker < m_yateSystem || time < m_lastYateCheck) {
Debug(&s_module,DebugInfo,"Negative values for yate CPU update" Debug(&s_module,DebugInfo,"Negative values for yate CPU update"
"cu = "FMT64U" lu="FMT64U" ck="FMT64U" lk="FMT64U" ct="FMT64U" lt="FMT64U" ", " cu = " FMT64U " lu=" FMT64U " ck=" FMT64U
" lk=" FMT64U " ct=" FMT64U " lt=" FMT64U,
user,m_yateUser,ker,m_yateSystem,time,m_lastYateCheck); user,m_yateUser,ker,m_yateSystem,time,m_lastYateCheck);
updateLoad = false; updateLoad = false;
} }

11
modules/sig/ss7_lnp_ansi.cpp
View File

@ -1465,7 +1465,8 @@ void LNPQuery::extractAddress(NamedList& params)
BlockedCode::BlockedCode(const char* code, u_int64_t duration, u_int64_t gap, LNPClient::ACGCause cause) BlockedCode::BlockedCode(const char* code, u_int64_t duration, u_int64_t gap, LNPClient::ACGCause cause)
: m_code(code) : m_code(code)
{ {
Debug(&__plugin,DebugAll,"BlockedCode created [%p] - code '%s' blocked for "FMT64U" seconds with gap="FMT64U" seconds, cause=%s", Debug(&__plugin,DebugAll,"BlockedCode created [%p] - code '%s' blocked for " FMT64U
" seconds with gap=" FMT64U " seconds, cause=%s",
this,m_code.c_str(),duration,gap,lookup(cause,s_acgCauses,"")); this,m_code.c_str(),duration,gap,lookup(cause,s_acgCauses,""));
update(duration,gap,cause); update(duration,gap,cause);
} }
@ -1478,15 +1479,15 @@ BlockedCode::~BlockedCode()
void BlockedCode::resetGapInterval() void BlockedCode::resetGapInterval()
{ {
u_int64_t interval = (u_int64_t) (90.0 + (110 - 90) * ((double)Random::random() / (double)RAND_MAX)) / 100.0 * m_gap; u_int64_t interval = (u_int64_t) (90.0 + (110 - 90) * ((double)Random::random() / (double)RAND_MAX)) / 100.0 * m_gap;
DDebug(&__plugin,DebugAll,"BlockedCode created [%p] - code '%s' has gap interval="FMT64" seconds",this,m_code.c_str(), DDebug(&__plugin,DebugAll,"BlockedCode created [%p] - code '%s' has gap interval=" FMT64
interval); " seconds",this,m_code.c_str(),interval);
m_gapExpiry = Time::secNow() + interval; m_gapExpiry = Time::secNow() + interval;
} }
void BlockedCode::update(u_int64_t duration, u_int64_t gap, LNPClient::ACGCause cause) void BlockedCode::update(u_int64_t duration, u_int64_t gap, LNPClient::ACGCause cause)
{ {
DDebug(&__plugin,DebugAll,"BlockedCode created [%p] - code '%s' update duration="FMT64" seconds, gap="FMT64" seconds",this,m_code.c_str(), DDebug(&__plugin,DebugAll,"BlockedCode created [%p] - code '%s' update duration=" FMT64
duration,gap); " seconds, gap=" FMT64 " seconds",this,m_code.c_str(),duration,gap);
m_cause = cause; m_cause = cause;
m_duration = (unsigned int)duration; m_duration = (unsigned int)duration;
m_durationExpiry = Time::secNow() + duration; m_durationExpiry = Time::secNow() + duration;