From c3b9c3ce4d6b389ab541609216113b26b02b224e Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 21 Mar 2015 17:21:26 +0100 Subject: [PATCH] Changed std::vector default value, should fix compilation errors on GCC 4.6 Fixes #393 --- src/object/objman.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/object/objman.h b/src/object/objman.h index 059492cf..52d9e5af 100644 --- a/src/object/objman.h +++ b/src/object/objman.h @@ -61,16 +61,16 @@ public: //! Finds an object, like radar() in CBot //@{ CObject* Radar(CObject* pThis, ObjectType type = OBJECT_NULL, float angle = 0.0f, float focus = Math::PI*2.0f, float minDist = 0.0f, float maxDist = 1000.0f, bool furthest = false, RadarFilter filter = FILTER_NONE, bool cbotTypes = false); - CObject* Radar(CObject* pThis, std::vector type = {}, float angle = 0.0f, float focus = Math::PI*2.0f, float minDist = 0.0f, float maxDist = 1000.0f, bool furthest = false, RadarFilter filter = FILTER_NONE, bool cbotTypes = false); + CObject* Radar(CObject* pThis, std::vector type = std::vector(), float angle = 0.0f, float focus = Math::PI*2.0f, float minDist = 0.0f, float maxDist = 1000.0f, bool furthest = false, RadarFilter filter = FILTER_NONE, bool cbotTypes = false); CObject* Radar(CObject* pThis, Math::Vector thisPosition, float thisAngle, ObjectType type = OBJECT_NULL, float angle = 0.0f, float focus = Math::PI*2.0f, float minDist = 0.0f, float maxDist = 1000.0f, bool furthest = false, RadarFilter filter = FILTER_NONE, bool cbotTypes = false); - CObject* Radar(CObject* pThis, Math::Vector thisPosition, float thisAngle, std::vector type = {}, float angle = 0.0f, float focus = Math::PI*2.0f, float minDist = 0.0f, float maxDist = 1000.0f, bool furthest = false, RadarFilter filter = FILTER_NONE, bool cbotTypes = false); + CObject* Radar(CObject* pThis, Math::Vector thisPosition, float thisAngle, std::vector type = std::vector(), float angle = 0.0f, float focus = Math::PI*2.0f, float minDist = 0.0f, float maxDist = 1000.0f, bool furthest = false, RadarFilter filter = FILTER_NONE, bool cbotTypes = false); //@} //! Returns nearest object that's closer than maxDist //@{ CObject* FindNearest(CObject* pThis, ObjectType type = OBJECT_NULL, float maxDist = 1000.0f, bool cbotTypes = false); - CObject* FindNearest(CObject* pThis, std::vector type = {}, float maxDist = 1000.0f, bool cbotTypes = false); + CObject* FindNearest(CObject* pThis, std::vector type = std::vector(), float maxDist = 1000.0f, bool cbotTypes = false); CObject* FindNearest(CObject* pThis, Math::Vector thisPosition, ObjectType type = OBJECT_NULL, float maxDist = 1000.0f, bool cbotTypes = false); - CObject* FindNearest(CObject* pThis, Math::Vector thisPosition, std::vector type = {}, float maxDist = 1000.0f, bool cbotTypes = false); + CObject* FindNearest(CObject* pThis, Math::Vector thisPosition, std::vector type = std::vector(), float maxDist = 1000.0f, bool cbotTypes = false); //@} protected: