Index: src/libchcore/TSubTaskArray.cpp =================================================================== diff -u -N -r3b320bc86d4e808c2f6a70c10bd5c9936102b301 -re8f31b0f922b402878356e130c866c4f3682a7f5 --- src/libchcore/TSubTaskArray.cpp (.../TSubTaskArray.cpp) (revision 3b320bc86d4e808c2f6a70c10bd5c9936102b301) +++ src/libchcore/TSubTaskArray.cpp (.../TSubTaskArray.cpp) (revision e8f31b0f922b402878356e130c866c4f3682a7f5) @@ -96,7 +96,7 @@ break; } default: - THROW_CORE_EXCEPTION(eErr_UndefinedOperation); + throw TCoreException(eErr_UndefinedOperation, L"Operation type not known to the engine", LOCATION); } } @@ -107,7 +107,7 @@ for (const std::pair& tupleRow : m_vSubTasks) { if (tupleRow.first == NULL) - THROW_CORE_EXCEPTION(eErr_InternalProblem); + throw TCoreException(eErr_InternalProblem, L"SubTask is null", LOCATION); tupleRow.first->Reset(); } @@ -222,7 +222,7 @@ if (bAdded) { if (m_oidLastStoredIndex != -1) - THROW_CORE_EXCEPTION(eErr_InternalProblem); + throw TCoreException(eErr_InternalProblem, L"Last object id is set when array is marked as added", LOCATION); for (size_t stSubOperationIndex = 0; stSubOperationIndex < m_vSubTasks.size(); ++stSubOperationIndex) { @@ -312,7 +312,7 @@ spSubTask->Load(spSerializer); if (boost::numeric_cast(oidID) != m_vSubTasks.size()) - THROW_CORE_EXCEPTION(eErr_InvalidData); + throw TCoreException(eErr_InvalidData, L"Object id does not match count of subtasks", LOCATION); m_vSubTasks.push_back(std::make_pair(spSubTask, bIsEstimation)); } @@ -341,7 +341,7 @@ return boost::make_shared(boost::ref(rContext)); default: - THROW_CORE_EXCEPTION(eErr_UnhandledCase); + throw TCoreException(eErr_UnhandledCase, L"SubTask is unknown to the engine", LOCATION); } }