Merge pull request #876 from multitheftauto/feature/c++17

Enable C++17

Author: sbx320

.travis.yml

@@ -10,25 +10,12 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - g++-5
+            - g++-8
             - zip
       env: 
-        ENV_CXX=g++-5 
-        ENV_CC=gcc-5 
+        ENV_CXX=g++-8 
+        ENV_CC=gcc-8
         NIGHTLY_UPLOAD=1
-    - compiler: clang
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-xenial-6.0
-          packages:
-            - clang-6.0
-            - zip
-      env: 
-        ENV_CXX=clang++-6.0 
-        ENV_CC=clang-6.0 
-        NIGHTLY_UPLOAD=0
 
 before_script:
   - wget https://mirror.mtasa.com/bdata/premake5-travis -4 -O ./premake5 &&

Client/cefweb/premake5.lua

@@ -6,7 +6,7 @@ project "Client Webbrowser"
 
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
-		linkoptions { "/SAFESEH\:NO" }
+		linkoptions { "/SAFESEH:NO" }
 		buildoptions { "-Zm130" }
 
 	filter {}

Client/core/StdInc.h

@@ -13,7 +13,6 @@
 
 #include <sys/stat.h>
 #include <d3d9.h>
-#include <d3dx9.h>
 #include <direct.h>
 #include <stdio.h>
 #include <dbghelp.h>

Client/core/premake5.lua

@@ -6,7 +6,7 @@ project "Client Core"
 
 	filter "system:windows"
 		includedirs { "../../vendor/sparsehash/src/windows" }
-		linkoptions { "/SAFESEH\:NO" }
+		linkoptions { "/SAFESEH:NO" }
 		buildoptions { "-Zm130" }
 
 	filter {}

Client/loader/premake5.lua

@@ -2,23 +2,23 @@ project "Loader"
 	language "C++"
 	kind "SharedLib"
 	targetname "loader"
-	targetdir(buildpath("mta"))
-	
-	filter "system:windows"
-		linkoptions { "/SAFESEH\:NO" }
+	targetdir(buildpath("mta"))
+	
+	filter "system:windows"
+		linkoptions { "/SAFESEH:NO" }
 
 	includedirs { 
 		"../sdk",
 		"../../vendor"
 	}
 
 	libdirs {
-		"../../vendor/detours/lib"
+		"../../vendor/detours/lib"
 	}
 
 	links {
 		"unrar", "d3d9",
-		"../../vendor/nvapi/x86/nvapi.lib"
+		"../../vendor/nvapi/x86/nvapi.lib"
 	}
 
 	pchheader "StdInc.h"
@@ -47,4 +47,4 @@ project "Loader"
 		flags { "ExcludeFromBuild" } 
 
 	filter "system:not windows"
-		flags { "ExcludeFromBuild" }
+		flags { "ExcludeFromBuild" }

Client/mods/deathmatch/premake5.lua

@@ -24,7 +24,7 @@ project "Client Deathmatch"
 
 	filter "system:windows"
 		includedirs { "../../../vendor/sparsehash/src/windows" }
-		linkoptions { "/SAFESEH\:NO" }
+		linkoptions { "/SAFESEH:NO" }
 
 	filter {}
 		includedirs {

Client/multiplayer_sa/CMultiplayerSA.cpp

@@ -4050,7 +4050,7 @@ void                        GetVehicleDriveType()
 }
 
 static CTransmission* pCurTransmission = nullptr;
-static byte*          pCurGear = nullptr;
+static ::byte*          pCurGear = nullptr;
 
 void CheckVehicleMaxGear()
 {

Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && \
 
 # Install latest gcc and libs
 RUN dpkg --add-architecture i386 && apt-get update && \
-    apt-get install -y ca-certificates git build-essential gcc-multilib g++-multilib gcc-6-multilib g++-6-multilib curl subversion ncftp \
+    apt-get install -y ca-certificates git build-essential gcc-multilib g++-multilib gcc-8-multilib g++-8-multilib curl subversion ncftp \
         libncursesw5-dev libmysqlclient-dev \
         lib32ncursesw5-dev libncursesw5-dev:i386
 

Server/core/CCrashHandler.cpp

@@ -18,10 +18,10 @@
 
 // clang-format off
 #ifndef WIN32
-    #ifdef __APPLE__
-        #include <ncurses.h>
-    #else
+    #if __has_include(<ncursesw/curses.h>)
         #include <ncursesw/curses.h>
+    #else 
+        #include <ncurses.h>
     #endif
 
     extern "C" WINDOW* m_wndMenu;

Server/core/CServerImpl.h

@@ -24,14 +24,6 @@ class CServerImpl;
 #include <xml/CXML.h>
 #include "CThreadCommandQueue.h"
 
-#ifndef WIN32
-    #ifdef __APPLE__
-        #include <ncurses.h>
-    #else
-        #include <ncursesw/curses.h>
-    #endif
-#endif
-
 #define SERVER_RESET_RETURN 500
 
 typedef CXML* (*InitXMLInterface)(const char* szSaveFlagDirectory);