Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblinphone
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
10
Issues
10
List
Board
Labels
Milestones
Merge Requests
22
Merge Requests
22
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
liblinphone
Commits
6caf117b
Commit
6caf117b
authored
Oct 04, 2017
by
Ronan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(Object): check weak ptr when `getSharedFromThis` is called
parent
459d54c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
object.cpp
src/object/object.cpp
+15
-2
No files found.
src/object/object.cpp
View file @
6caf117b
...
...
@@ -16,12 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "logger/logger.h"
#include "object-p.h"
#include "object.h"
// =============================================================================
#define GET_SHARED_FROM_THIS_FATAL_ERROR "Object was not created with `ObjectFactory::create`."
using
namespace
std
;
LINPHONE_BEGIN_NAMESPACE
...
...
@@ -33,11 +36,21 @@ Object::~Object () {
Object
::
Object
(
ObjectPrivate
&
p
)
:
mPrivate
(
&
p
)
{}
shared_ptr
<
Object
>
Object
::
getSharedFromThis
()
{
return
mPrivate
->
weak
.
lock
(
);
return
const_pointer_cast
<
Object
>
(
static_cast
<
const
Object
*>
(
this
)
->
getSharedFromThis
()
);
}
shared_ptr
<
const
Object
>
Object
::
getSharedFromThis
()
const
{
return
mPrivate
->
weak
.
lock
();
shared_ptr
<
const
Object
>
object
;
try
{
object
=
mPrivate
->
weak
.
lock
();
if
(
!
object
)
lFatal
()
<<
GET_SHARED_FROM_THIS_FATAL_ERROR
;
}
catch
(
const
exception
&
)
{
lFatal
()
<<
GET_SHARED_FROM_THIS_FATAL_ERROR
;
}
return
object
;
}
void
ObjectFactory
::
setPublic
(
const
shared_ptr
<
Object
>
&
object
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment