Skip to content

fix: openbts build error on gcc7 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: openbts build error on gcc7 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Control/L3StateMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@ void MachineBase::machineErrorMessage(int level, int state, const L3Message *l3m

// This kind sucks, digging into the Logger. The logger could be better.
if (l3msg) {
Log(level).get() <<os <<" Unexpected L3 message:"<<l3msg;
Log(level).get() <<os.str() <<" Unexpected L3 message:"<<l3msg;
} else if (sipmsg) {
Log(level).get() <<os <<" Unexpected SIP message:"<<sipmsg;
Log(level).get() <<os.str() <<" Unexpected SIP message:"<<sipmsg;
} else {
Log(level).get() <<os <<" Unexpected"<<LOGHEX(state);
Log(level).get() <<os.str() <<" Unexpected"<<LOGHEX(state);
}
}

Expand Down
2 changes: 1 addition & 1 deletion GPRS/MSInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ bool MSInfo::msAssignChannels()
if (msPCHDowns.size() > 1) {
std::ostringstream os;
msDumpChannels(os);
LOG(INFO) << "Multislot assignment for "<<this<<os;
LOG(INFO) << "Multislot assignment for "<<this<<os.str();
}

} else {
Expand Down
4 changes: 2 additions & 2 deletions SGSNGGSN/Sgsn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void SgsnInfo::sirm()
{
std::ostringstream ss;
sgsnInfoDump(this,ss);
SGSNLOG("Removing SgsnInfo:"<<ss);
SGSNLOG("Removing SgsnInfo:"<<ss.str());
sSgsnInfoList.remove(this);
delete this;
}
Expand Down Expand Up @@ -224,7 +224,7 @@ static void GmmRemove(GmmInfo *gmm)
{
std::ostringstream ss;
gmmInfoDump(gmm,ss,0);
SGSNLOG("Removing gmm:"<<ss);
SGSNLOG("Removing gmm:"<<ss.str());
SgsnInfo *si;
RN_FOR_ALL(SgsnInfoList_t,sSgsnInfoList,si) {
// The second test here should be redundant.
Expand Down