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

Fixed concatenation of strings to work with modern C++ compilers. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6347 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2019-03-13 15:16:40 +00:00
parent b339c4b655
commit 19a5023270
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/radio/ybladerf.cpp
View File

@ -3219,7 +3219,7 @@ const char* BrfBufsThreshold::init(DataBlock& db, const String& str,
} }
else else
bSamples = s.substr(pos1 + 1).trimBlanks().toInt64(-1); bSamples = s.substr(pos1 + 1).trimBlanks().toInt64(-1);
XDebug(&__plugin,DebugAll,"BrfBufsThreshold::init() %u/%u '%s' -> "FMT64"/"FMT64"/%d", XDebug(&__plugin,DebugAll,"BrfBufsThreshold::init() %u/%u '%s' -> " FMT64 "/" FMT64 "/%d",
i + 1,n,s.c_str(),sRate,bSamples,txMinBufs); i + 1,n,s.c_str(),sRate,bSamples,txMinBufs);
if (sRate < caps.minSampleRate || sRate > caps.maxSampleRate) if (sRate < caps.minSampleRate || sRate > caps.maxSampleRate)
result = "samplerate out of range"; result = "samplerate out of range";
@ -6537,7 +6537,7 @@ unsigned int BrfLibUsbDevice::internalSetFreqOffs(float val, float* newVal, Stri
unsigned int BrfLibUsbDevice::internalSetFrequency(bool tx, uint64_t val, String* error) unsigned int BrfLibUsbDevice::internalSetFrequency(bool tx, uint64_t val, String* error)
{ {
XDebug(m_owner,DebugAll,"BrfLibUsbDevice::setFrequency("FMT64U",%s) [%p]", XDebug(m_owner,DebugAll,"BrfLibUsbDevice::setFrequency(" FMT64U ",%s) [%p]",
val,brfDir(tx),m_owner); val,brfDir(tx),m_owner);
String e; String e;
unsigned int status = 0; unsigned int status = 0;
@ -6612,7 +6612,7 @@ unsigned int BrfLibUsbDevice::internalSetFrequency(bool tx, uint64_t val, String
break; break;
} }
if (status) { if (status) {
e.printf(1024,"Failed to set %s frequency to "FMT64U"Hz - %s",brfDir(tx),val,e.c_str()); e.printf(1024,"Failed to set %s frequency to " FMT64U "Hz - %s",brfDir(tx),val,e.c_str());
return showError(status,e,0,error); return showError(status,e,0,error);
} }
if (getDirState(tx).frequency != hz) { if (getDirState(tx).frequency != hz) {