Author: tschmitz
Date: Tue Aug 2 12:14:05 2011
New Revision: 50555
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50555&view=rev
Log:
Added fcn side_actions::safe_clear().
Modified:
trunk/src/whiteboard/side_actions.cpp
trunk/src/whiteboard/side_actions.hpp
Modified: trunk/src/whiteboard/side_actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/side_actions.cpp?rev=50555&r1=50554&r2=50555&view=diff
==============================================================================
--- trunk/src/whiteboard/side_actions.cpp (original)
+++ trunk/src/whiteboard/side_actions.cpp Tue Aug 2 12:14:05 2011
@@ -667,7 +667,7 @@
}
else if(type=="clear")
{
- actions_.clear();
+ safe_clear();
}
else
{
Modified: trunk/src/whiteboard/side_actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/side_actions.hpp?rev=50555&r1=50554&r2=50555&view=diff
==============================================================================
--- trunk/src/whiteboard/side_actions.hpp (original)
+++ trunk/src/whiteboard/side_actions.hpp Tue Aug 2 12:14:05 2011
@@ -110,7 +110,7 @@
/**
* Empties the action queue.
*/
- void clear() { actions_.clear(); }
+ void clear() { safe_clear(); }
/**
* Queues a move to be executed last
@@ -230,6 +230,7 @@
bool validate_iterator(iterator position) { return position >= begin()
&& position < end(); }
action_queue::iterator safe_erase(action_queue::iterator const& itor) {
action_ptr action = *itor; return actions_.erase(itor); }
+ void safe_clear() { action_queue temp = actions_; return
actions_.clear(); }
action_queue actions_;
size_t team_index_;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
