'Fixed' Linux compile warnings.

multitheftauto · Sep 15, 2015 · 02f5e7e · 02f5e7e
1 parent 6fb63b1
commit 02f5e7e
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 23 deletions.
diff --git a/MTA10_Server/core/CCrashHandler.cpp b/MTA10_Server/core/CCrashHandler.cpp
@@ -77,7 +77,7 @@ void CCrashHandler::Init ( const SString& strInServerPath )
 #ifndef WIN32
 
 // Save basic backtrace info into a file. Forced inline to avoid backtrace pollution
-__attribute__((always_inline))
+inline __attribute__((always_inline))
 static void SaveBacktraceSummary()
 {
     // Collect backtrace information

diff --git a/MTA10_Server/core/CModManagerImpl.h b/MTA10_Server/core/CModManagerImpl.h
@@ -29,7 +29,7 @@ class CModManagerImpl : public CModManager
 {
 public:
                         CModManagerImpl         ( CServerImpl* pServer );
-                        ~CModManagerImpl        ( void );
+    virtual             ~CModManagerImpl        ( void );
 
     inline void         SetServerPath           ( const char* szServerPath )    { m_strServerPath = szServerPath; };
 

diff --git a/MTA10_Server/core/CServerImpl.cpp b/MTA10_Server/core/CServerImpl.cpp
@@ -29,7 +29,7 @@
     #include <unistd.h>
 
     // This is probably safer than changing MTAPlatform.h against compatibility issues
-    #undef Printf
+    #undef Print
     #define Print printf
 #endif
 

diff --git a/MTA10_Server/core/Server.cpp b/MTA10_Server/core/Server.cpp
@@ -14,7 +14,9 @@
 #include "CServerImpl.h"
 #define ALLOC_STATS_MODULE_NAME "core"
 #include "SharedUtil.hpp"
-#include "SharedUtil.Tests.hpp"
+#if defined(_DEBUG) 
+    #include "SharedUtil.Tests.hpp"
+#endif
 #ifdef WIN_x86
     // TODO - 64 bit file hooks
     #include "SharedUtil.Win32Utf8FileHooks.hpp"

diff --git a/MTA10_Server/mods/deathmatch/logic/CAccountManager.cpp b/MTA10_Server/mods/deathmatch/logic/CAccountManager.cpp
@@ -290,19 +290,18 @@ bool CAccountManager::LoadXML ( CXMLNode* pParent )
                             }
                             else
                             {
-                                CAccount* pAccount = NULL;
                                 pAttribute = pAccountNode->GetAttributes ().Find ( "serial" );
                                 if ( pAttribute )
                                 {
                                     //Insert the entry into the accounts database
                                     m_pDatabaseManager->Execf ( m_hDbConnection, "INSERT INTO accounts (name, password, serial) VALUES(?,?,?)", SQLITE_TEXT, strName.c_str(), SQLITE_TEXT, strPassword.c_str(), SQLITE_TEXT, pAttribute->GetValue().c_str() );
-                                    pAccount = new CAccount ( this, true, strName, strPassword, "", m_iAccounts++, pAttribute->GetValue () );
+                                    new CAccount ( this, true, strName, strPassword, "", m_iAccounts++, pAttribute->GetValue () );
                                 }
                                 else
                                 {
                                     //Insert the entry into the accounts database
                                     m_pDatabaseManager->Execf ( m_hDbConnection, "INSERT INTO accounts (name, password) VALUES(?,?)", SQLITE_TEXT, strName.c_str(), SQLITE_TEXT, strPassword.c_str() );
-                                    pAccount = new CAccount ( this, true, strName, strPassword, "", m_iAccounts++, "" );
+                                    new CAccount ( this, true, strName, strPassword, "", m_iAccounts++, "" );
                                 }
                             }
                         }

diff --git a/MTA10_Server/mods/deathmatch/logic/CDatabaseManager.cpp b/MTA10_Server/mods/deathmatch/logic/CDatabaseManager.cpp
@@ -444,7 +444,7 @@ void CDatabaseManagerImpl::SetLogLevel ( EJobLogLevelType logLevel, const SStrin
     CDbOptionsMap argMap;
     argMap.Set ( "name", strLogFilename );
     argMap.Set ( "level", logLevel );
-    CDbJobData* pJobData = m_JobQueue->AddCommand ( EJobCommand::SETLOGLEVEL, NULL, argMap.ToString () );
+    CDbJobData* pJobData = m_JobQueue->AddCommand ( EJobCommand::SETLOGLEVEL, 0, argMap.ToString () );
     m_JobQueue->FreeCommand ( pJobData );
 }
 

diff --git a/MTA10_Server/mods/deathmatch/logic/CGame.cpp b/MTA10_Server/mods/deathmatch/logic/CGame.cpp
@@ -989,7 +989,7 @@ bool CGame::ProcessPacket ( CPacket& Packet )
 {
     // Can we handle it?
     ePacketID PacketID = Packet.GetPacketID ();
-    switch ( PacketID )
+    switch ( (int)PacketID )
     {
         case PACKET_ID_PLAYER_JOINDATA:
         {

diff --git a/MTA10_Server/mods/deathmatch/logic/CPacketTranslator.cpp b/MTA10_Server/mods/deathmatch/logic/CPacketTranslator.cpp
@@ -31,7 +31,7 @@ CPacket* CPacketTranslator::Translate ( const NetServerPlayerID& Socket, ePacket
 {
     // Create the packet class
     CPacket* pTemp = NULL;
-    switch ( PacketID )
+    switch ( (int)PacketID )
     {
         case PACKET_ID_PLAYER_JOIN:
             pTemp = new CPlayerJoinPacket;

diff --git a/MTA10_Server/mods/deathmatch/logic/CXMLConfig.h b/MTA10_Server/mods/deathmatch/logic/CXMLConfig.h
@@ -21,7 +21,7 @@ class CXMLConfig
 {
 public:
                                 CXMLConfig          ( const char* szFileName );
-                                ~CXMLConfig         ( void );
+    virtual                     ~CXMLConfig         ( void );
 
     inline std::string&         GetFileName         ( void )                    { return m_strFileName; }
     void                        SetFileName         ( const char* szFileName );

diff --git a/MTA10_Server/mods/deathmatch/logic/Utils.cpp b/MTA10_Server/mods/deathmatch/logic/Utils.cpp
@@ -374,13 +374,12 @@ bool IsValidOrganizationPath ( const char *szDir )
     if ( uiLen > 0 && szDir [ uiLen - 1 ] == '/' ) // will return false if ending with an invalid character, mainly used for linux (#6871)
         return false;
 
-    unsigned char c, c_d;
+    unsigned char c;
     bool bInsideBraces = false;
 
     // iterate through the char array
     for ( unsigned int i = 0; i < uiLen; i++ ) {
         c = szDir[i];                                       // current character
-        c_d = ( i < ( uiLen - 1 ) ) ? szDir[i+1] : 0;       // one character ahead, if any
 
         // Enforce braces around visible letters
         if ( !bInsideBraces && IsVisibleCharacter ( c ) && c != '[' && c != ']' && c != '/' && c != '\\' )

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaModule.h b/MTA10_Server/mods/deathmatch/logic/lua/CLuaModule.h
@@ -47,7 +47,7 @@ class CLuaModule : public ILuaModuleManager10
 public:
 
                             CLuaModule          ( CLuaModuleManager* pLuaModuleManager, CScriptDebugging* pScriptDebugging, const char* szFileName, const char* szShortFileName );
-                            ~CLuaModule         ( void );
+    virtual                 ~CLuaModule         ( void );
 
     // functions for external modules until DP2.3
     void                    Printf                  ( const char * szFormat, ... );

diff --git a/MTA10_Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h b/MTA10_Server/mods/deathmatch/logic/net/CSimPlayerPuresyncPacket.h
@@ -12,7 +12,7 @@ class CSimPacket
 {
 public:
                                         CSimPacket          ( void )                        { DEBUG_CREATE_COUNT( "CSimPacket" ); }
-                                        ~CSimPacket         ( void )                        { DEBUG_DESTROY_COUNT( "CSimPacket" ); }
+    virtual                             ~CSimPacket         ( void )                        { DEBUG_DESTROY_COUNT( "CSimPacket" ); }
 
     virtual ePacketID                   GetPacketID         ( void ) const = 0;
     virtual ePacketOrdering             GetPacketOrdering   ( void ) const { return PACKET_ORDERING_DEFAULT; }

diff --git a/Shared/XML/CXMLImpl.h b/Shared/XML/CXMLImpl.h
@@ -19,7 +19,7 @@ class CXMLImpl : public CXML
 {
 public:
                         CXMLImpl            ( void );
-                        ~CXMLImpl           ( void );
+    virtual             ~CXMLImpl           ( void );
 
     CXMLFile*           CreateXML           ( const char* szFilename, bool bUseIDs );
     void                DeleteXML           ( CXMLFile* pFile );

diff --git a/Shared/animation/CEasingCurve.cpp b/Shared/animation/CEasingCurve.cpp
@@ -32,7 +32,8 @@ class CComplexEasingFunction
         m_fPeriod ( period ),
         m_fOvershoot ( overshoot)
     { }
-
+    virtual ~CComplexEasingFunction( void ) {}
+
     virtual double valueForProgress ( double a_fProgress ) const = 0;
 
     eType   m_eType;

diff --git a/initial-install.sh b/initial-install.sh
@@ -43,13 +43,13 @@ cd ../..
 # building in parallel mode (use -j<JOBS>)
 if [ $1 = "-g" ]; then
     make \
-                  CFLAGS='-g -O2 -fPIC -DPIC -Wno-uninitialized' \
-                CXXFLAGS='-g -O2 -fPIC -DPIC -Wno-uninitialized -std=gnu++0x' \
-                CPPFLAGS='-g -O2 -fPIC -DPIC -Wno-uninitialized' >_make.log
+                  CFLAGS='-g -O2 -fPIC -DPIC -Wno-uninitialized -Wno-narrowing' \
+                CXXFLAGS='-g -O2 -fPIC -DPIC -Wno-uninitialized -Wno-narrowing -std=c++0x' \
+                CPPFLAGS='-g -O2 -fPIC -DPIC -Wno-uninitialized -Wno-narrowing' >_make.log
 else
     make \
-                  CFLAGS='-O2 -fPIC -DPIC -Wno-uninitialized' \
-                CXXFLAGS='-O2 -fPIC -DPIC -Wno-uninitialized -std=gnu++0x' \
-                CPPFLAGS='-O2 -fPIC -DPIC -Wno-uninitialized' >_make.log
+                  CFLAGS='-O2 -fPIC -DPIC -Wno-uninitialized -Wno-narrowing' \
+                CXXFLAGS='-O2 -fPIC -DPIC -Wno-uninitialized -Wno-narrowing -std=c++0x' \
+                CPPFLAGS='-O2 -fPIC -DPIC -Wno-uninitialized -Wno-narrowing' >_make.log
 fi