[ekiga/gnome-2-26] Use different C++ std function so that ekiga does not crash on gdb on Windows
- From: Eugen Dedu <ededu src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [ekiga/gnome-2-26] Use different C++ std function so that ekiga does not crash on gdb on Windows
- Date: Mon, 3 Aug 2009 22:23:42 +0000 (UTC)
commit b63de196783c6b6ffc86b359e0a75162a2bf9be4
Author: Michael Rickmann <mrickma gwdg de>
Date: Tue Aug 4 00:05:10 2009 +0200
Use different C++ std function so that ekiga does not crash on gdb on Windows
It seems that list::remove is not correctly implemented, so use
list::erase instead.
lib/engine/components/opal/sip-endpoint.cpp | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 03645a2..205b393 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -648,7 +648,7 @@ Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
return;
if (was_registering) {
- for (std::list<std::string>::const_iterator iter = to_subscribe_uris.begin ();
+ for (std::list<std::string>::iterator iter = to_subscribe_uris.begin ();
iter != to_subscribe_uris.end () ; ) {
found = (*iter).find (server, 0);
@@ -657,14 +657,14 @@ Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
Subscribe (SIPSubscribe::Presence, 300, PString ((*iter).c_str ()));
Subscribe (SIPSubscribe::Dialog, 300, PString ((*iter).c_str ()));
subscribed_uris.push_back (*iter);
- to_subscribe_uris.remove (*iter++);
+ iter = to_subscribe_uris.erase (iter);
}
else
++iter;
}
}
else {
- for (std::list<std::string>::const_iterator iter = subscribed_uris.begin ();
+ for (std::list<std::string>::iterator iter = subscribed_uris.begin ();
iter != subscribed_uris.end () ; ) {
found = (*iter).find (server, 0);
@@ -673,7 +673,7 @@ Opal::Sip::EndPoint::OnRegistered (const PString & _aor,
Unsubscribe (SIPSubscribe::Presence, PString ((*iter).c_str ()));
Unsubscribe (SIPSubscribe::Dialog, PString ((*iter).c_str ()));
to_subscribe_uris.push_back (*iter);
- subscribed_uris.remove (*iter++);
+ iter = subscribed_uris.erase (iter);
}
else
iter++;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]