- changes from pvqa-server project

This commit is contained in:
2018-07-15 11:46:50 +03:00
parent a6535bdb97
commit 20ee81666b
11 changed files with 118 additions and 37 deletions

View File

@@ -38,7 +38,7 @@ protected:
std::string mPeer;
};
typedef SharedPtr<ClientObserver> PClientObserver;
typedef std::shared_ptr<ClientObserver> PClientObserver;
class ServerObserver
{
@@ -68,6 +68,6 @@ protected:
int mSessionId;
};
typedef SharedPtr<ServerObserver> PServerObserver;
typedef std::shared_ptr<ServerObserver> PServerObserver;
#endif // EP_OBSERVER_H

View File

@@ -167,12 +167,12 @@ int ResipSession::sessionId()
return mSessionId;
}
void ResipSession::setUASProfile(SharedPtr<resip::UserProfile> profile)
void ResipSession::setUASProfile(std::shared_ptr<resip::UserProfile> profile)
{
mUASProfile = profile;
}
SharedPtr<resip::UserProfile> ResipSession::selectUASUserProfile(const resip::SipMessage& msg)
resip::SharedPtr<resip::UserProfile> ResipSession::selectUASUserProfile(const resip::SipMessage& msg)
{
assert(mUserAgent != nullptr);
@@ -184,7 +184,7 @@ SharedPtr<resip::UserProfile> ResipSession::selectUASUserProfile(const resip::Si
else
return mUserAgent->mProfile;
}
return SharedPtr<resip::UserProfile>();
return resip::SharedPtr<resip::UserProfile>();
}
#pragma endregion

View File

@@ -321,7 +321,7 @@ public:
static resip::AtomicCounter InstanceCounter;
};
typedef SharedPtr<Session> PSession;
typedef std::shared_ptr<Session> PSession;
/////////////////////////////////////////////////////////////////////////////////
//
@@ -383,7 +383,7 @@ public:
void runTerminatedEvent(Type type, int code = 0, int reason = 0);
void setUASProfile(SharedPtr<resip::UserProfile> profile);
void setUASProfile(std::shared_ptr<resip::UserProfile> profile);
protected:
bool mTerminated;
@@ -394,7 +394,7 @@ protected:
std::string mRemoteAddress;
void* mTag;
bool mOnWatchingStartSent;
SharedPtr<resip::UserProfile> mUASProfile;
std::shared_ptr<resip::UserProfile> mUASProfile;
};