[ekiga/ds-fix-boost-leaks] AddressBook: Allow multiple inheritance.
- From: Damien Sandras <dsandras src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga/ds-fix-boost-leaks] AddressBook: Allow multiple inheritance.
- Date: Sun, 31 May 2015 14:24:17 +0000 (UTC)
commit 8d631dcb12e5b5e17d0f9272e05bf42ec046aeed
Author: Damien Sandras <dsandras seconix com>
Date: Sun May 31 14:48:09 2015 +0200
AddressBook: Allow multiple inheritance.
lib/engine/addressbook/book.h | 2 +-
lib/engine/addressbook/contact.h | 2 +-
lib/engine/addressbook/source.h | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/addressbook/book.h b/lib/engine/addressbook/book.h
index 0eaaf4d..daa3611 100644
--- a/lib/engine/addressbook/book.h
+++ b/lib/engine/addressbook/book.h
@@ -43,7 +43,7 @@ namespace Ekiga {
class Book;
typedef boost::shared_ptr<Book> BookPtr;
- class Book: public Actor
+ class Book: public virtual Actor
{
public:
diff --git a/lib/engine/addressbook/contact.h b/lib/engine/addressbook/contact.h
index 281aeb3..49ffaed 100644
--- a/lib/engine/addressbook/contact.h
+++ b/lib/engine/addressbook/contact.h
@@ -52,7 +52,7 @@ namespace Ekiga
* @{
*/
- class Contact: public Actor
+ class Contact: public virtual Actor
{
public:
diff --git a/lib/engine/addressbook/source.h b/lib/engine/addressbook/source.h
index aed6892..d857a33 100644
--- a/lib/engine/addressbook/source.h
+++ b/lib/engine/addressbook/source.h
@@ -44,8 +44,7 @@ namespace Ekiga {
class Source;
typedef boost::shared_ptr<Source> SourcePtr;
- class Source:
- public Actor
+ class Source: public virtual Actor
{
public:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]