Some ambiguous calls of map::erase have been prevented by adding additional check in locality constructor
TTI's has_type has been changed to MPL's has_xxx for checking iterator
decay has been applied to exact template parameter
Merge pull request #1331 from AntonBikineev/master

Some ambiguous calls of map::erase have been prevented by adding additional check in locality constructor.