Merged in Glorf/ryzomcore/fix_compilation_mac (pull request #152)

Fix compilation (tools + server) on OSX

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
This commit is contained in:
Cédric OCHS 2017-04-29 09:09:09 +00:00
commit 9bc910d102
8 changed files with 53 additions and 43 deletions

View file

@ -1,3 +1,6 @@
IF(APPLE)
add_definitions("-ftemplate-depth=100")
ENDIF()
FILE(GLOB SRC *.cpp *.h)
LIST(REMOVE_ITEM SRC

View file

@ -84,7 +84,7 @@ uint ImpactSchemes [6][3] = { { 0, 1, 2 }, { 0, 2, 1 }, { 1, 0, 2 }, { 1, 2, 0 }
// Observed impact on E (/10): 6 3 1 1 3 10
// Note: if modifying this schemes, please change FORAGE_SOURCE_IMPACT_MODE in phrase_en.txt.
uint SpecialNewbieImpactSchemeD = 10;
uint16 LowDangerMappings [2] = { (uint16)SpecialNewbieImpactSchemeD+1, (uint16)SpecialNewbieImpactSchemeD+4 };
uint16 LowDangerMappings [2] = {(uint16)(SpecialNewbieImpactSchemeD+1), (uint16)(SpecialNewbieImpactSchemeD+4)};
sint8 ExplosionResetPeriod = 50; // 5 s

View file

@ -48,19 +48,19 @@ public:
SerialNumber(0)
{
// warn the client that the transport is open
CMessage nil;
sendRawMessage("MODULE_GATEWAY:FEOPEN", nil);
CMessage msg;
sendRawMessage("MODULE_GATEWAY:FEOPEN", msg);
}
~CFEServerRoute()
{
// warn the client that the transport is closed
CMessage nil;
CMessage msg;
// check special case when application close
if (!CActionFactory::isInstanceAllocated())
return;
sendRawMessage("MODULE_GATEWAY:FECLOSE", nil);
sendRawMessage("MODULE_GATEWAY:FECLOSE", msg);
}

View file

@ -179,7 +179,7 @@ void CMailForumService::checkFile(const std::string& file)
++pt;
// file contents "$$$$" -> end of file marker, file is complete, can be deleted
if (pt != '\0')
if (*pt != '\0')
{
CFile::deleteFile(file);

View file

@ -36,6 +36,10 @@
typedef unsigned long ulong;
#endif // NL_OS_WINDOWS
#ifdef NL_OS_MAC
typedef unsigned long ulong;
#endif
#include <mysql.h>
using namespace NLMISC;

View file

@ -55,7 +55,7 @@ namespace RY_PDS
* 0 is remapped to the new object value that appears in stream and so on (reallocations are done
* circularly through key values). Mask value is for test purposes only, not to be changed!
*/
template<typename Key, typename Object, int Mask = 0xffffffff, typename TBackMap = std::map<Object, Key> >
template<typename Key, typename Object, uint32 Mask = 0xffffffff, typename TBackMap = std::map<Object, Key> >
class CObjCircMapper
{
public:

View file

@ -30,6 +30,9 @@
# include <Windows.h>
typedef unsigned long ulong;
#endif
#ifdef NL_OS_MAC
typedef unsigned long ulong;
#endif
#include <mysql.h>
#include <time.h>

View file

@ -2201,9 +2201,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CSessionPtr nil;
static CSessionPtr nilPtr;
return nil;
return nilPtr;
}
@ -2252,9 +2252,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CSessionParticipantPtr nil;
static CSessionParticipantPtr nilPtr;
return nil;
return nilPtr;
}
@ -2303,9 +2303,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CKnownUserPtr nil;
static CKnownUserPtr nilPtr;
return nil;
return nilPtr;
}
@ -2354,9 +2354,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CPlayerRatingPtr nil;
static CPlayerRatingPtr nilPtr;
return nil;
return nilPtr;
}
@ -3016,9 +3016,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CKnownUserPtr nil;
static CKnownUserPtr nilPtr;
return nil;
return nilPtr;
}
@ -3054,8 +3054,8 @@ namespace RSMGR
if (it == _Characters->end())
{
// no object with this id, return a null pointer
static CCharacterPtr nil;
return nil;
static CCharacterPtr nilPtr;
return nilPtr;
}
return const_cast< CCharacterPtr & >(it->second);
@ -3107,9 +3107,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CFolderPtr nil;
static CFolderPtr nilPtr;
return nil;
return nilPtr;
}
@ -3158,9 +3158,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CFolderAccessPtr nil;
static CFolderAccessPtr nilPtr;
return nil;
return nilPtr;
}
@ -4273,9 +4273,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CSessionParticipantPtr nil;
static CSessionParticipantPtr nilPtr;
return nil;
return nilPtr;
}
@ -4324,9 +4324,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CGuildInvitePtr nil;
static CGuildInvitePtr nilPtr;
return nil;
return nilPtr;
}
@ -4375,9 +4375,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CJournalEntryPtr nil;
static CJournalEntryPtr nilPtr;
return nil;
return nilPtr;
}
@ -4891,8 +4891,8 @@ namespace RSMGR
if (it == _Guilds->end())
{
// no object with this id, return a null pointer
static CGuildPtr nil;
return nil;
static CGuildPtr nilPtr;
return nilPtr;
}
return const_cast< CGuildPtr & >(it->second);
@ -5514,9 +5514,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CCharacterPtr nil;
static CCharacterPtr nilPtr;
return nil;
return nilPtr;
}
@ -5565,9 +5565,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CGuildInvitePtr nil;
static CGuildInvitePtr nilPtr;
return nil;
return nilPtr;
}
@ -8046,9 +8046,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CFolderAccessPtr nil;
static CFolderAccessPtr nilPtr;
return nil;
return nilPtr;
}
@ -8097,9 +8097,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CSessionPtr nil;
static CSessionPtr nilPtr;
return nil;
return nilPtr;
}
@ -9312,9 +9312,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CSessionLogPtr nil;
static CSessionLogPtr nilPtr;
return nil;
return nilPtr;
}
@ -9363,9 +9363,9 @@ namespace RSMGR
}
// no object with this id, return a null pointer
static CPlayerRatingPtr nil;
static CPlayerRatingPtr nilPtr;
return nil;
return nilPtr;
}