default to O2 on release builds as O3 can cause larger code to be even larger; fix most of the compiler warnings

This commit is contained in:
CodeCodon
2015-08-06 11:33:28 -05:00
parent b1d6744deb
commit 513cb7048e
4 changed files with 5 additions and 5 deletions
@@ -12,7 +12,7 @@
#include "serverGame/CreatureObject.h"
#include <cstdio>
#include <hash_set>
#include <unordered_set>
// ======================================================================
@@ -706,7 +706,7 @@ const Region * RegionMaster::addDynamicRegion(const UniverseObject & source)
DEBUG_WARNING(true, ("RegionMaster::addDynamicRegion object %s has unknown "
"geometry type", source.getNetworkId().getValueString().c_str(),
geometry));
return false;
return NULL;
}
if (region == NULL)
{
@@ -235,13 +235,13 @@ ShipInternalDamageOverTime const * const ShipInternalDamageOverTimeManager::find
//-- there is no lower bound, the idot is not in the vector
if (lowerBound == s_idotVector.end())
return false;
return NULL;
ShipInternalDamageOverTime & lowerBoundIdot = *lowerBound;
//-- the lower bound sorts greater than the new idot, therefore this is a new insertion
if (idot < lowerBoundIdot)
return false;
return NULL;
return &lowerBoundIdot;
}
@@ -74,7 +74,7 @@ void GameScheduler::remove()
DEBUG_FATAL(!s_installed, ("GameScheduler not installed."));
delete s_scheduler;
s_scheduler = false;
s_scheduler = NULL;
s_installed = false;
}