diff --git a/src/Lib/terragear/tg_unique_geod.hxx b/src/Lib/terragear/tg_unique_geod.hxx index 3f14a0a5..095a7bd0 100644 --- a/src/Lib/terragear/tg_unique_geod.hxx +++ b/src/Lib/terragear/tg_unique_geod.hxx @@ -84,7 +84,7 @@ inline bool operator == (const SGGeodIndex& a, const SGGeodIndex& b) { ( fabs(a.geod.getLatitudeDeg() - b.geod.getLatitudeDeg()) < PROXIMITY_EPSILON )); } -struct SGGeodIndexHash : std::unary_function +struct SGGeodIndexHash { std::size_t operator()(SGGeodIndex const& gi) const { return gi.GetHash(); diff --git a/src/Lib/terragear/tg_unique_tgnode.hxx b/src/Lib/terragear/tg_unique_tgnode.hxx index 92268948..00680a7e 100644 --- a/src/Lib/terragear/tg_unique_tgnode.hxx +++ b/src/Lib/terragear/tg_unique_tgnode.hxx @@ -187,7 +187,7 @@ inline bool operator == (const TGNodeIndex& a, const TGNodeIndex& b) { ( fabs(a.geod.getLatitudeDeg() - b.geod.getLatitudeDeg()) < PROXIMITY_EPSILON )); } -struct TGNodeIndexHash : std::unary_function +struct TGNodeIndexHash { std::size_t operator()(TGNodeIndex const& gi) const { return gi.GetHash(); diff --git a/src/Lib/terragear/tg_unique_vec2f.hxx b/src/Lib/terragear/tg_unique_vec2f.hxx index cd1170b0..c27ee853 100644 --- a/src/Lib/terragear/tg_unique_vec2f.hxx +++ b/src/Lib/terragear/tg_unique_vec2f.hxx @@ -81,7 +81,7 @@ inline bool operator == (const SGVec2fIndex& a, const SGVec2fIndex& b) { ( fabs(a.vec.y() - b.vec.y()) < PROXIMITY_EPSILON )); } -struct SGVec2fIndexHash : std::unary_function +struct SGVec2fIndexHash { std::size_t operator()(SGVec2fIndex const& vi) const { return vi.GetHash(); diff --git a/src/Lib/terragear/tg_unique_vec3d.hxx b/src/Lib/terragear/tg_unique_vec3d.hxx index 0b1bbd84..48a36e02 100644 --- a/src/Lib/terragear/tg_unique_vec3d.hxx +++ b/src/Lib/terragear/tg_unique_vec3d.hxx @@ -74,7 +74,7 @@ inline bool operator == (const SGVec3dIndex& a, const SGVec3dIndex& b) { ( fabs(a.vec.z() - b.vec.z()) < PROXIMITY_EPSILON )); } -struct SGVec3dIndexHash : std::unary_function +struct SGVec3dIndexHash { std::size_t operator()(SGVec3dIndex const& vi) const { return vi.GetHash(); diff --git a/src/Lib/terragear/tg_unique_vec3f.hxx b/src/Lib/terragear/tg_unique_vec3f.hxx index e765d3df..65b19cbb 100644 --- a/src/Lib/terragear/tg_unique_vec3f.hxx +++ b/src/Lib/terragear/tg_unique_vec3f.hxx @@ -83,7 +83,7 @@ inline bool operator == (const SGVec3fIndex& a, const SGVec3fIndex& b) { ( fabs(a.vec.z() - b.vec.z()) < PROXIMITY_EPSILON )); } -struct SGVec3fIndexHash : std::unary_function +struct SGVec3fIndexHash { std::size_t operator()(SGVec3fIndex const& vi) const { return vi.GetHash();