Update: #825 Added no-strict-aliasing (NOT PERMANENT) and fixed initialization order.

hg/feature/sound
Matt Raykowski 15 years ago
parent 9a56fe33b9
commit 22fc0c3447

@ -75,7 +75,7 @@ MACRO(NL_SETUP_BUILD)
SET(NL_RELEASE_CFLAGS "/Ox /Ob2 /Oi /Ot /Oy /GT /GF")
SET(NL_RELEASEDEBUG_CFLAGS "/DNL_RELEASE_DEBUG /Ob2 /GF")
ELSE(WIN32)
SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused")
SET(PLATFORM_CFLAGS "-ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused -fno-strict-aliasing")
IF(WITH_COVERAGE)
SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
ENDIF(WITH_COVERAGE)

@ -29,10 +29,10 @@ uint CDynChatSession::_NumSessions = 0;
/////////////////////
//================================================================
CDynChatSession::CDynChatSession(CDynChatClient *client, CDynChatChan *channel)
: _Client(client),
_Channel(channel),
StringID(0),
WriteRight(false)
: StringID(0),
WriteRight(false),
_Client(client),
_Channel(channel)
{
nlassert(client);
nlassert(channel);
@ -102,7 +102,7 @@ CDynChatSession::~CDynChatSession()
// CDynChatClient //
////////////////////
//================================================================
CDynChatClient::CDynChatClient(const TDataSetRow &client) : _ID(client), _FirstSession(NULL)
CDynChatClient::CDynChatClient(const TDataSetRow &client) : _FirstSession(NULL), _ID(client)
{
}
@ -136,26 +136,26 @@ CDynChatSession *CDynChatClient::getSession(TChanID chan) const
// CDynChatChan //
//////////////////
CDynChatChan::CDynChatChan()
: _ID(CEntityId::Unknown),
: HistoricSize(0),
HideBubble(false),
_FirstSession(NULL),
HistoricSize(0),
_ID(CEntityId::Unknown),
_DontBroadcastPlayerInputs(false),
_ForwardPlayerIntputToOwnerService(false),
_UnifyChannel(false),
HideBubble(false)
_UnifyChannel(false)
{
}
//================================================================
//CDynChatChan::CDynChatChan(TChanID id) : _ID(id), _FirstSession(NULL), HistoricSize(0)
CDynChatChan::CDynChatChan(TChanID id, bool noBroadcast, bool forwardInput, bool unified)
: _ID(id),
: HistoricSize(0),
HideBubble(false),
_FirstSession(NULL),
HistoricSize(0),
_ID(id),
_DontBroadcastPlayerInputs(noBroadcast),
_ForwardPlayerIntputToOwnerService(forwardInput),
_UnifyChannel(unified),
HideBubble(false)
_UnifyChannel(unified)
{
}

@ -1485,17 +1485,17 @@ void CMirror::changeValue( const NLMISC::CEntityId& entityId, const std::string&
*/
CMirror::CMirror() :
_PendingEntityTypesRanges(0),
_MirrorAllReady(false),
_ReadyL1Callback(NULL),
_NotificationCallback(NULL),
_UserSyncCallback(NULL),
_MirrorAllReady(false),
_MirrorGotReadyLevel1(false),
_MirrorGotReadyLevel2(false),
_ListOfOtherPropertiesReceived(false),
_AwaitingAllMirrorsOnline(false),
_IsExecutingSynchronizedCode(false),
MonitoredEntity(CEntityId::Unknown),
_ClosureRequested(false),
_UserSyncCallback(NULL)
MonitoredEntity(CEntityId::Unknown)
{
nlassert( ! MirrorInstance ); // singleton check
MirrorInstance = this;

@ -95,7 +95,7 @@ inline ucstring capitalize(const ucstring & s)
nldebug("Dumping callstack :"); \
for (uint i=0; i<contexts.size(); ++i) \
nldebug(" %3u : %s", i, contexts[i].c_str());
#define nlassertd(a) if (0) ; else
#define nlassertd(a) if (0) { } else { }
#endif
// the following set of definess can be undefined and re-defined to add user code to execute

Loading…
Cancel
Save