From beb03d7e844414acf8af10deef0b8b9dcd43b18c Mon Sep 17 00:00:00 2001 From: mkrzewic Date: Mon, 10 Feb 2014 13:35:17 +0100 Subject: [PATCH] restore changes which did not make it to master --- STEER/CDB/AliCDBLocal.cxx | 8 ++++---- cmake/CMakelinuxx8664gcc.cmake | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/STEER/CDB/AliCDBLocal.cxx b/STEER/CDB/AliCDBLocal.cxx index 6e4eb29b1d1..6e62989af6b 100644 --- a/STEER/CDB/AliCDBLocal.cxx +++ b/STEER/CDB/AliCDBLocal.cxx @@ -516,7 +516,7 @@ AliCDBEntry* AliCDBLocal::GetEntry(const AliCDBId& queryId) { TString errMessage(TString::Format("No valid CDB object found! request was: %s", queryId.ToString().Data())); if (!dataId || !dataId->IsSpecified()){ AliError(Form("The data ID is undefined!")); - throw std::runtime_error(errMessage.Data()); + //throw std::runtime_error(errMessage.Data()); return NULL; } @@ -524,7 +524,7 @@ AliCDBEntry* AliCDBLocal::GetEntry(const AliCDBId& queryId) { if (!IdToFilename(*dataId, filename)) { AliError(Form("Bad data ID encountered!")); delete dataId; - throw std::runtime_error(errMessage.Data()); + //throw std::runtime_error(errMessage.Data()); return NULL; } @@ -532,7 +532,7 @@ AliCDBEntry* AliCDBLocal::GetEntry(const AliCDBId& queryId) { if (!file.IsOpen()) { AliError(Form("Can't open file <%s>!", filename.Data())); delete dataId; - throw std::runtime_error(errMessage.Data()); + //throw std::runtime_error(errMessage.Data()); return NULL; } @@ -544,7 +544,7 @@ AliCDBEntry* AliCDBLocal::GetEntry(const AliCDBId& queryId) { AliError(Form("Bad storage data: No AliCDBEntry in file!")); file.Close(); delete dataId; - throw std::runtime_error(errMessage.Data()); + //throw std::runtime_error(errMessage.Data()); return NULL; } diff --git a/cmake/CMakelinuxx8664gcc.cmake b/cmake/CMakelinuxx8664gcc.cmake index d36b7b66cbe..dd8b9d853fd 100644 --- a/cmake/CMakelinuxx8664gcc.cmake +++ b/cmake/CMakelinuxx8664gcc.cmake @@ -29,7 +29,7 @@ set(OPT) # ------- Setting optimization flags for default configuration ------- if((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None")) - set(DEFAULT_CXX_FLAGS "-O -g") + set(DEFAULT_CXX_FLAGS "-g -ggdb") set(OPT "${DEFAULT_CXX_FLAGS}") message("-- Setting compiler flags for default configuration: ${DEFAULT_CXX_FLAGS}") endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None")) @@ -37,7 +37,7 @@ endif((NOT CMAKE_BUILD_TYPE) OR (CMAKE_BUILD_TYPE STREQUAL "None")) # -------------------------------------------------------------------- -set(NOOPT "-g") +set(NOOPT "-g -ggdb") set(CXXOPT ${OPT}) set(CXXNOPT ${NOOPT}) -- 2.39.3