|
 |
49700cd |
From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
|
|
|
49700cd |
From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
|
|
|
49700cd |
Date: Sat, 24 Mar 2012 09:17:40 +0000
|
|
|
49700cd |
Subject: Fix compile error with gcc 4.7
|
|
|
49700cd |
|
|
|
49700cd |
---
|
|
|
49700cd |
diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
|
|
|
49700cd |
index e16848e..b0a8775 100644
|
|
|
49700cd |
--- a/lib/engine/account/bank-impl.h
|
|
|
49700cd |
+++ b/lib/engine/account/bank-impl.h
|
|
|
49700cd |
@@ -203,7 +203,7 @@ template<typename AccountType>
|
|
|
49700cd |
void
|
|
|
49700cd |
Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
|
|
|
49700cd |
{
|
|
|
49700cd |
- add_object (account);
|
|
|
49700cd |
+ this->add_object (account);
|
|
|
49700cd |
|
|
|
49700cd |
account->questions.connect (boost::ref (questions));
|
|
|
49700cd |
}
|
|
|
49700cd |
@@ -213,7 +213,7 @@ template<typename AccountType>
|
|
|
49700cd |
void
|
|
|
49700cd |
Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
|
|
|
49700cd |
{
|
|
|
49700cd |
- remove_object (account);
|
|
|
49700cd |
+ this->remove_object (account);
|
|
|
49700cd |
}
|
|
|
49700cd |
|
|
|
49700cd |
#endif
|
|
|
49700cd |
diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
|
|
|
49700cd |
index 711d8d9..4fea7d5 100644
|
|
|
49700cd |
--- a/lib/engine/addressbook/book-impl.h
|
|
|
49700cd |
+++ b/lib/engine/addressbook/book-impl.h
|
|
|
49700cd |
@@ -204,7 +204,7 @@ void
|
|
|
49700cd |
Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
|
|
|
49700cd |
{
|
|
|
49700cd |
contact->questions.connect (boost::ref (questions));
|
|
|
49700cd |
- add_object (contact);
|
|
|
49700cd |
+ this->add_object (contact);
|
|
|
49700cd |
}
|
|
|
49700cd |
|
|
|
49700cd |
|
|
|
49700cd |
@@ -212,7 +212,7 @@ template<typename ContactType>
|
|
|
49700cd |
void
|
|
|
49700cd |
Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
|
|
|
49700cd |
{
|
|
|
49700cd |
- remove_object (contact);
|
|
|
49700cd |
+ this->remove_object (contact);
|
|
|
49700cd |
}
|
|
|
49700cd |
|
|
|
49700cd |
#endif
|
|
|
49700cd |
diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
|
|
|
49700cd |
index a30cd03..630236f 100644
|
|
|
49700cd |
--- a/lib/engine/addressbook/source-impl.h
|
|
|
49700cd |
+++ b/lib/engine/addressbook/source-impl.h
|
|
|
49700cd |
@@ -206,7 +206,7 @@ template<typename BookType>
|
|
|
49700cd |
void
|
|
|
49700cd |
Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
|
|
|
49700cd |
{
|
|
|
49700cd |
- add_object (book);
|
|
|
49700cd |
+ this->add_object (book);
|
|
|
49700cd |
|
|
|
49700cd |
add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
|
|
|
49700cd |
|
|
|
49700cd |
diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
|
|
|
49700cd |
index 245a7c6..92074a8 100644
|
|
|
49700cd |
--- a/lib/engine/presence/cluster-impl.h
|
|
|
49700cd |
+++ b/lib/engine/presence/cluster-impl.h
|
|
|
49700cd |
@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
|
|
|
49700cd |
|
|
|
49700cd |
add_connection (heap, heap->questions.connect (boost::ref (questions)));
|
|
|
49700cd |
|
|
|
49700cd |
- add_object (heap);
|
|
|
49700cd |
+ this->add_object (heap);
|
|
|
49700cd |
}
|
|
|
49700cd |
|
|
|
49700cd |
template<typename HeapType>
|
|
|
49700cd |
diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
|
|
|
49700cd |
index d63c491..15fe86f 100644
|
|
|
49700cd |
--- a/lib/engine/presence/heap-impl.h
|
|
|
49700cd |
+++ b/lib/engine/presence/heap-impl.h
|
|
|
49700cd |
@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr
|
|
|
49700cd |
{
|
|
|
49700cd |
presentity->questions.connect (boost::ref (questions));
|
|
|
49700cd |
|
|
|
49700cd |
- add_object (presentity);
|
|
|
49700cd |
+ this->add_object (presentity);
|
|
|
49700cd |
}
|
|
|
49700cd |
|
|
|
49700cd |
template<typename PresentityType>
|
|
|
49700cd |
void
|
|
|
49700cd |
Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
|
|
|
49700cd |
{
|
|
|
49700cd |
- remove_object (presentity);
|
|
|
49700cd |
+ this->remove_object (presentity);
|
|
|
49700cd |
}
|
|
|
49700cd |
|
|
|
49700cd |
#endif
|
|
|
49700cd |
--
|
|
|
49700cd |
cgit v0.9.0.2
|