From 513cb7048ee27978b90b870c08ede71ac11b0c0b Mon Sep 17 00:00:00 2001 From: CodeCodon Date: Thu, 6 Aug 2015 11:33:28 -0500 Subject: [PATCH] default to O2 on release builds as O3 can cause larger code to be even larger; fix most of the compiler warnings --- .../src/shared/console/ConsoleCommandParserSpawner.cpp | 2 +- .../library/serverGame/src/shared/region/RegionMaster.cpp | 2 +- .../src/shared/space/ShipInternalDamageOverTimeManager.cpp | 4 ++-- .../library/sharedGame/src/shared/core/GameScheduler.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp index bfa49123..79de38b7 100644 --- a/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp +++ b/engine/server/library/serverGame/src/shared/console/ConsoleCommandParserSpawner.cpp @@ -12,7 +12,7 @@ #include "serverGame/CreatureObject.h" #include -#include +#include // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp index 48ce40d8..6cbb7710 100644 --- a/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp +++ b/engine/server/library/serverGame/src/shared/region/RegionMaster.cpp @@ -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) { diff --git a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp index 771251a0..3cc0f54f 100644 --- a/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp +++ b/engine/server/library/serverGame/src/shared/space/ShipInternalDamageOverTimeManager.cpp @@ -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; } diff --git a/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp b/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp index c23d15af..e0b848ba 100644 --- a/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/GameScheduler.cpp @@ -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; }