fix some compile warnings (treated as errors) on clang 3.6.1

anttisalonen · Sep 22, 2015 · 9dc2958 · 9dc2958
1 parent 42bae64
commit 9dc2958
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/src/match/ai/AIPlayStates.h b/src/match/ai/AIPlayStates.h
@@ -50,9 +50,9 @@ class AIState {
 class AIGoalkeeperState : public AIState {
 	public:
 		AIGoalkeeperState(Player* p, AIPlayController* m);
-		boost::shared_ptr<PlayerAction> actOnBall(double time);
-		boost::shared_ptr<PlayerAction> actNearBall(double time);
-		boost::shared_ptr<PlayerAction> actOffBall(double time);
+		boost::shared_ptr<PlayerAction> actOnBall(double time) override;
+		boost::shared_ptr<PlayerAction> actNearBall(double time) override;
+		boost::shared_ptr<PlayerAction> actOffBall(double time) override;
 		void matchHalfChanged(MatchHalf m) override;
 
 	private:
@@ -67,27 +67,27 @@ class AIGoalkeeperState : public AIState {
 class AIDefendState : public AIState {
 	public:
 		AIDefendState(Player* p, AIPlayController* m);
-		boost::shared_ptr<PlayerAction> actOffBall(double time);
+		boost::shared_ptr<PlayerAction> actOffBall(double time) override;
 };
 
 class AIKickBallState : public AIState {
 	public:
 		AIKickBallState(Player* p, AIPlayController* m);
-		boost::shared_ptr<PlayerAction> actOnBall(double time);
-		boost::shared_ptr<PlayerAction> actNearBall(double time);
-		boost::shared_ptr<PlayerAction> actOffBall(double time);
+		boost::shared_ptr<PlayerAction> actOnBall(double time) override;
+		boost::shared_ptr<PlayerAction> actNearBall(double time) override;
+		boost::shared_ptr<PlayerAction> actOffBall(double time) override;
 };
 
 class AIOffensiveState : public AIState {
 	public:
 		AIOffensiveState(Player* p, AIPlayController* m);
-		boost::shared_ptr<PlayerAction> actOffBall(double time);
+		boost::shared_ptr<PlayerAction> actOffBall(double time) override;
 };
 
 class AIMidfielderState : public AIState {
 	public:
 		AIMidfielderState(Player* p, AIPlayController* m);
-		boost::shared_ptr<PlayerAction> actOffBall(double time);
+		boost::shared_ptr<PlayerAction> actOffBall(double time) override;
 };
 
 

diff --git a/src/match/ai/PlayerAIController.h b/src/match/ai/PlayerAIController.h
@@ -9,7 +9,7 @@
 class PlayerAIController : public PlayerController {
 	public:
 		PlayerAIController(Player* p);
-		boost::shared_ptr<PlayerAction> act(double time);
+		boost::shared_ptr<PlayerAction> act(double time) override;
 		const std::string& getDescription() const;
 		virtual void matchHalfChanged(MatchHalf m) override;
 	protected:

diff --git a/src/soccer/gui/Slider.h b/src/soccer/gui/Slider.h
@@ -17,7 +17,7 @@ class Slider : public Button {
 	public:
 		Slider(const char* text, TTF_Font* font, const Common::Rectangle& dim, float value);
 		virtual bool clicked(int x, int y) override;
-		virtual void draw(int screenWidth, int screenHeight);
+		virtual void draw(int screenWidth, int screenHeight) override;
 		float getValue();
 
 	private: