Line 0
Link Here
|
|
|
1 |
Fix compiling with libc++ and Clang |
2 |
|
3 |
src/world.cpp:689:53: error: no viable conversion from '__map_iterator<__tree_iterator<__value_type<unsigned int, [...]>, class std::__1::__tree_node<union |
4 |
std::__1::__value_type<unsigned int, struct base_item_s *>, void *> *, [...]>>' to '__map_iterator<__tree_iterator<__value_type<const unsigned int, [...]>, class std::__1::__tree_node<union std::__1::__value_type<const unsigned int, struct base_item_s *>, void |
5 |
*> *, [...]>>' |
6 |
std::map<const uint32_t, base_item_p>::iterator it = global_world.items_tree.find(item_id); |
7 |
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
8 |
--- src/world.cpp.orig 2017-04-28 13:32:52 UTC |
9 |
+++ src/world.cpp |
10 |
@@ -686,7 +686,7 @@ int World_CreateItem(uint32_t item_id, u |
11 |
|
12 |
int World_DeleteItem(uint32_t item_id) |
13 |
{ |
14 |
- std::map<const uint32_t, base_item_p>::iterator it = global_world.items_tree.find(item_id); |
15 |
+ std::map<uint32_t, base_item_p>::iterator it = global_world.items_tree.find(item_id); |
16 |
|
17 |
if(it != global_world.items_tree.end()) |
18 |
{ |