Author: silene
Date: Sun May 17 22:30:59 2009
New Revision: 35717
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35717&view=rev
Log:
Removed unused functions.
Modified:
trunk/src/unit_map.cpp
trunk/src/unit_map.hpp
Modified: trunk/src/unit_map.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_map.cpp?rev=35717&r1=35716&r2=35717&view=diff
==============================================================================
--- trunk/src/unit_map.cpp (original)
+++ trunk/src/unit_map.cpp Sun May 17 22:30:59 2009
@@ -90,28 +90,6 @@
unit_map::const_unit_iterator unit_map::find(const size_t &id) const {
umap::const_iterator iter = map_.find(id);
- iter = is_valid(iter) ? iter : map_.end();
-
- return const_unit_iterator(iter, this);
-}
-
-static bool match_unit_id(std::string id, unit_map::umap::value_type val) {
- return val.second.valid() && val.second.get_unit().id() == id;
-}
-
-unit_map::unit_iterator unit_map::find(const std::string& id) {
- WRN_NG << "Finding using id is slow operation\n";
-
- umap::iterator iter = std::find_if(map_.begin(), map_.end(),
std::bind1st(std::ptr_fun(match_unit_id), id));
- iter = is_valid(iter) ? iter : map_.end();
-
- return unit_iterator(iter, this);
-}
-
-unit_map::const_unit_iterator unit_map::find(const std::string& id) const {
- WRN_NG << "Finding using id is slow operation\n";
-
- umap::const_iterator iter = std::find_if(map_.begin(), map_.end(),
std::bind1st(std::ptr_fun(match_unit_id), id));
iter = is_valid(iter) ? iter : map_.end();
return const_unit_iterator(iter, this);
Modified: trunk/src/unit_map.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_map.hpp?rev=35717&r1=35716&r2=35717&view=diff
==============================================================================
--- trunk/src/unit_map.hpp (original)
+++ trunk/src/unit_map.hpp Sun May 17 22:30:59 2009
@@ -277,17 +277,14 @@
/**
- * Lookups can be done by map_location, by unit::underlying_id(), or by
unit::id().
- * Looking up with unit::id() is slow.
+ * Lookups can be done by map_location, by unit::underlying_id().
* Returned iterators can be implicitly converted to the other types.
*/
unit_iterator find(const map_location& loc) ;
unit_iterator find(const unit_id_type& id);
- unit_iterator find(const std::string& id);
const_unit_iterator find(const map_location& loc) const;
const_unit_iterator find(const unit_id_type& id) const;
- const_unit_iterator find(const std::string& id) const;
const_unit_iterator find_leader(int side) const;
unit_iterator find_leader(int side);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
