From 81434c9b7a60dd7edb50d12c7f4ac367449a1454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matt=C3=A9o=20Delabre?= <contact@matteodelabre.me>
Date: Thu, 31 Mar 2016 10:20:09 +0200
Subject: [PATCH] =?UTF-8?q?Repassage=20=C3=A0=20C++11=20pour=20compatibili?=
 =?UTF-8?q?t=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt           | 14 +++++++-------
 src/block.cpp            |  4 ++--
 src/game.cpp             |  3 ++-
 src/main.cpp             |  2 +-
 src/player.cpp           |  4 ++--
 src/resource_manager.cpp |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39fc2c4..1b87b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,15 +18,15 @@ endif()
 
 # Standard C++14
 include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
-CHECK_CXX_COMPILER_FLAG("-std=c++1y" COMPILER_SUPPORTS_CXX1Y)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
 
-if(COMPILER_SUPPORTS_CXX14)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-elseif(COMPILER_SUPPORTS_CXX1Y)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
+if(COMPILER_SUPPORTS_CXX11)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+elseif(COMPILER_SUPPORTS_CXX0X)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
 else()
-    message(STATUS "Le compilateur actuel (${CMAKE_CXX_COMPILER}) ne supporte pas C++14. Merci d'utiliser un autre compilateur.")
+    message(STATUS "Le compilateur actuel (${CMAKE_CXX_COMPILER}) ne supporte pas C++11. Merci d'utiliser un autre compilateur.")
 endif()
 
 # Recherche des librairies
diff --git a/src/block.cpp b/src/block.cpp
index 369f303..d73aa73 100644
--- a/src/block.cpp
+++ b/src/block.cpp
@@ -36,11 +36,11 @@ void Block::draw(Manager& manager) {
 }
 
 std::unique_ptr<sf::FloatRect> Block::getAABB() const {
-    return std::make_unique<sf::FloatRect>(
+    return std::unique_ptr<sf::FloatRect>(new sf::FloatRect(
         getPosition().x - Constants::GRID / 2,
         getPosition().y - Constants::GRID / 2,
         Constants::GRID, Constants::GRID
-    );
+    ));
 }
 
 const unsigned int Block::TYPE_ID = 1;
diff --git a/src/game.cpp b/src/game.cpp
index 125eaf3..37666ba 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -53,7 +53,8 @@ void Game::load(std::ifstream& file) {
         pos_x *= Constants::GRID;
         pos_y *= Constants::GRID;
 
-        std::shared_ptr<Player> player = std::make_shared<Player>(pos_x, pos_y);
+        std::shared_ptr<Player> player =
+            std::shared_ptr<Player>(new Player(pos_x, pos_y));
         player->setPlayerNumber(i);
 
         objects.push_back(std::dynamic_pointer_cast<Object>(player));
diff --git a/src/main.cpp b/src/main.cpp
index b59c0b3..69c778e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,7 +10,7 @@
 
 int main() {
     Manager manager;
-    std::shared_ptr<Game> game = std::make_shared<Game>(manager);
+    std::shared_ptr<Game> game = std::shared_ptr<Game>(new Game(manager));
 
     // ouverture du niveau
     std::ifstream file;
diff --git a/src/player.cpp b/src/player.cpp
index 7483fe7..c942abc 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -53,11 +53,11 @@ void Player::draw(Manager& manager) {
 }
 
 std::unique_ptr<sf::FloatRect> Player::getAABB() const {
-    return std::make_unique<sf::FloatRect>(
+    return std::unique_ptr<sf::FloatRect>(new sf::FloatRect(
         getPosition().x - getRadius(),
         getPosition().y - getRadius(),
         2 * getRadius(), 2 * getRadius()
-    );
+    ));
 }
 
 const unsigned int Player::TYPE_ID = 0;
diff --git a/src/resource_manager.cpp b/src/resource_manager.cpp
index 89a8d4f..1e992ad 100644
--- a/src/resource_manager.cpp
+++ b/src/resource_manager.cpp
@@ -16,7 +16,7 @@ ResourceManager::~ResourceManager() {
  */
 std::string getCurrentDirectory() {
     int length = wai_getExecutablePath(NULL, 0, NULL), dirname_length;
-    std::unique_ptr<char[]> buffer = std::make_unique<char[]>(length + 1);
+    std::unique_ptr<char[]> buffer = std::unique_ptr<char[]>(new char[length + 1]);
     wai_getExecutablePath(buffer.get(), length, &dirname_length);
 
     if (dirname_length == 0) {