[colobot] 278/390: Changed std::vector default value, should fix compilation errors on GCC 4.6

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit c3b9c3ce4d6b389ab541609216113b26b02b224e
Author: krzys-h <krzy...@interia.pl>
Date:   Sat Mar 21 17:21:26 2015 +0100

    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 059492c..52d9e5a 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<ObjectType> 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<ObjectType> type = 
std::vector<ObjectType>(), 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<ObjectType> 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<ObjectType> type = std::vector<ObjectType>(), 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<ObjectType> type = {}, 
float maxDist = 1000.0f, bool cbotTypes = false);
+    CObject*  FindNearest(CObject* pThis, std::vector<ObjectType> type = 
std::vector<ObjectType>(), 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<ObjectType> type = {}, float maxDist = 1000.0f, bool cbotTypes = 
false);
+    CObject*  FindNearest(CObject* pThis, Math::Vector thisPosition, 
std::vector<ObjectType> type = std::vector<ObjectType>(), float maxDist = 
1000.0f, bool cbotTypes = false);
     //@}
 
 protected:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/colobot.git

_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits