Author: boucman
Date: Mon Aug 1 16:42:51 2011
New Revision: 50528
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50528&view=rev
Log:
partial revert of previous commit that shouldn't have been there
Modified:
trunk/src/map_location.hpp
Modified: trunk/src/map_location.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/map_location.hpp?rev=50528&r1=50527&r2=50528&view=diff
==============================================================================
--- trunk/src/map_location.hpp (original)
+++ trunk/src/map_location.hpp Mon Aug 1 16:42:51 2011
@@ -24,7 +24,6 @@
#include <string>
#include <vector>
#include <set>
-#include <boost/unordered_map.hpp>
#define MAX_MAP_AREA 65536
@@ -99,8 +98,6 @@
static DIRECTION get_opposite_dir(DIRECTION d);
static const map_location null_location;
-
- friend std::size_t hash_value(map_location const &a);
};
/** Function which tells if two locations are adjacent. */
@@ -141,10 +138,4 @@
/** Dumps a vector of positions on a stream, for debug purposes. */
std::ostream &operator<<(std::ostream &s, std::vector<map_location> const &v);
-/** Inlined bodies **/
-inline std::size_t hash_value(map_location const & a){
- boost::hash<size_t> h;
- return h( (a.x << 16) ^ a.y );
-}
-
#endif
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
