From ec3e43fb092cc6520ac4517e155f06df8af5c18c Mon Sep 17 00:00:00 2001
From: GokuWeedLord <adam@notadam.me>
Date: Thu, 14 Dec 2017 17:02:30 +1100
Subject: [PATCH] maybe travis will use boost1.63

---
 .travis.yml                                     | 5 +++--
 CMakeLists.txt                                  | 4 ----
 src/servers/Server_Zone/Script/ScriptLoader.cpp | 4 ++--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 21eb7833..89af64ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,8 +29,9 @@ cache:
 before_install:
   - eval "${MATRIX_EVAL}"
   - gem install --no-ri --no-rdoc mtime_cache
+  - sudo add-apt-repository ppa:rexut/recoil
   - sudo apt-get update
-  - sudo apt-get install -y libboost-dev libboost-all-dev
+  - sudo apt-get install -y libboost1.63-dev libboost1.63-all-dev
   - sudo apt-get install -y libmysqlclient-dev libmysqlcppconn-dev
 
 # Build steps
@@ -39,6 +40,6 @@ script:
   - mtime_cache src/**/*.{%{cpp}} -c .mtime_cache/cache.json
   - mkdir -p build
   - cd build
-  - cmake .. -DSAPPHIRE_BOOST_VER="1.54.0" && make -j 3
+  - cmake .. -DSAPPHIRE_BOOST_VER="1.63.0" && make -j 3
   - cd ..
   - bash sql_import.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a611bc56..54f7d380 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,6 @@ set(EXECUTABLE_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
 set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
-if(UNIX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -lstdc++fs")
-endif()
-
 ##########################################################################
 # Boost stuff
 
diff --git a/src/servers/Server_Zone/Script/ScriptLoader.cpp b/src/servers/Server_Zone/Script/ScriptLoader.cpp
index 29c1bf71..7900a91e 100644
--- a/src/servers/Server_Zone/Script/ScriptLoader.cpp
+++ b/src/servers/Server_Zone/Script/ScriptLoader.cpp
@@ -6,12 +6,12 @@
 
 #include <boost/format.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-#include <experimental/filesystem>
+#include <boost/filesystem.hpp>
 
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 
-namespace fs = std::experimental::filesystem;
+namespace fs = boost::filesystem;
 
 Core::Scripting::ScriptLoader::ScriptLoader()
 {}