From b1d6744deb113fe5645a96648d11b2a75769cd38 Mon Sep 17 00:00:00 2001 From: CodeCodon Date: Thu, 6 Aug 2015 11:22:08 -0500 Subject: [PATCH] default to O2 --- CMakeLists.txt | 2 +- .../serverScript/src/shared/ScriptMethodsDataTable.cpp | 2 +- .../library/serverScript/src/shared/ScriptMethodsShip.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1e113f..df2c9d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ elseif(UNIX) find_package(Curses REQUIRED) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DDEBUG_LEVEL=2 -DPRODUCTION=0 -g -O0") - set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -O3 -s") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDEBUG_LEVEL=0 -DPRODUCTION=1 -O2 -s") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings") diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp index 28e55e36..e84b0de6 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsDataTable.cpp @@ -1121,7 +1121,7 @@ jobject JNICALL ScriptMethodsDataTableNamespace::dataTableGetRow(JNIEnv *env, jo LocalRefPtr target = createNewObject(JavaLibrary::getClsDictionary(), JavaLibrary::getMidDictionary()); if (target == LocalRef::cms_nullPtr) - return false; + return JNI_FALSE; for (int i = 0; i < dt->getNumColumns(); ++i) { diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp index 988e3cb1..8c40cd6c 100644 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsShip.cpp @@ -1339,7 +1339,7 @@ jstring JNICALL ScriptMethodsShipNamespace::getShipComponentName(JNIEnv * env, j { ShipObject const * const shipObject = JavaLibrary::getShipThrow(env, jobject_shipId, "getShipComponentName() invalid ship", false); if (!shipObject) - return false; + return NULL; Unicode::String const & name = shipObject->getComponentName(chassisSlot); if (!name.empty()) @@ -4073,7 +4073,7 @@ jlongArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsResourceT { ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast(ShipChassisSlotType::SCST_cargo_hold)); if (!shipObject) - return false; + return NULL; ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents(); @@ -4099,7 +4099,7 @@ jintArray JNICALL ScriptMethodsShipNamespace::getShipCargoHoldContentsAmounts(JN { ShipObject const * const shipObject = getShipThrowTestSlot(env, jobject_shipId, "getShipCargoHoldContents()", false, static_cast(ShipChassisSlotType::SCST_cargo_hold)); if (!shipObject) - return false; + return NULL; ShipObject::NetworkIdIntMap const & contents = shipObject->getCargoHoldContents();