Skip to content

Commit a4b0b7b

Browse files
authored
Fix C++11 compatibility errors with std::make_unique and inline static (#4635)
1 parent fc9f0d8 commit a4b0b7b

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

pjsip/src/pjsua2-test/instant_messaging.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828

2929
using namespace pj;
3030

31+
// Definition of static member
32+
TestState InstantMessagingTests::testState;
33+
3134
ReceiverAccount::ReceiverAccount()
3235
{
3336
}
@@ -113,15 +116,15 @@ void InstantMessagingTests::immediateResponse()
113116
receiverCfg.idUri = "sip:receiver@localhost:5060";
114117
receiverCfg.sipConfig.autoRespondSipMessage = PJ_TRUE;
115118

116-
receiverAcc = std::make_unique<ReceiverAccount>();
119+
receiverAcc = std::unique_ptr<ReceiverAccount>(new ReceiverAccount());
117120
receiverAcc->create(receiverCfg);
118121
std::cout << "*** Receiver account created: " << receiverCfg.idUri << "\n";
119122

120123
AccountConfig senderCfg;
121124
senderCfg.idUri = "sip:sender@localhost:5060";
122125
senderCfg.sipConfig.autoRespondSipMessage = PJ_TRUE;
123126

124-
senderAcc = std::make_unique<SenderAccount>();
127+
senderAcc = std::unique_ptr<SenderAccount>(new SenderAccount());
125128
senderAcc->create(senderCfg);
126129
std::cout << "*** Sender account created: " << senderCfg.idUri << "\n";
127130

@@ -132,7 +135,7 @@ void InstantMessagingTests::immediateResponse()
132135
buddyCfg.subscribe = false;
133136
buddyCfg.subscribe_dlg_event = false;
134137

135-
senderBuddy = std::make_unique<Buddy>();
138+
senderBuddy = std::unique_ptr<Buddy>(new Buddy());
136139
senderBuddy->create(*senderAcc, buddyCfg);
137140

138141
const std::string testMessage = "Hello world!";
@@ -167,15 +170,15 @@ void InstantMessagingTests::deferredResponse()
167170
receiverCfg.idUri = "sip:receiver@localhost:5060";
168171
receiverCfg.sipConfig.autoRespondSipMessage = PJ_FALSE;
169172

170-
receiverAcc = std::make_unique<ReceiverAccount>();
173+
receiverAcc = std::unique_ptr<ReceiverAccount>(new ReceiverAccount());
171174
receiverAcc->create(receiverCfg);
172175
std::cout << "*** Receiver account created: " << receiverCfg.idUri << "\n";
173176

174177
AccountConfig senderCfg;
175178
senderCfg.idUri = "sip:sender@localhost:5060";
176179
senderCfg.sipConfig.autoRespondSipMessage = PJ_FALSE;
177180

178-
senderAcc = std::make_unique<SenderAccount>();
181+
senderAcc = std::unique_ptr<SenderAccount>(new SenderAccount());
179182
senderAcc->create(senderCfg);
180183
std::cout << "*** Sender account created: " << senderCfg.idUri << "\n";
181184

@@ -186,7 +189,7 @@ void InstantMessagingTests::deferredResponse()
186189
buddyCfg.subscribe = false;
187190
buddyCfg.subscribe_dlg_event = false;
188191

189-
senderBuddy = std::make_unique<Buddy>();
192+
senderBuddy = std::unique_ptr<Buddy>(new Buddy());
190193
senderBuddy->create(*senderAcc, buddyCfg);
191194

192195
const std::string testMessage = "Hello world!";

pjsip/src/pjsua2-test/instant_messaging.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ struct TestState {
7979
*/
8080
class InstantMessagingTests
8181
{
82-
inline static TestState testState;
82+
static TestState testState;
8383
friend class ReceiverAccount;
8484
friend class SenderAccount;
8585

0 commit comments

Comments
 (0)