Index: src/libchcore/TTaskOperationPlan.cpp =================================================================== diff -u -N -r6dc950d4d76107421ff6eb62069b70f20bcc450e -re9926b6e83984d0f30bf2008b93874c7c483d95c --- src/libchcore/TTaskOperationPlan.cpp (.../TTaskOperationPlan.cpp) (revision 6dc950d4d76107421ff6eb62069b70f20bcc450e) +++ src/libchcore/TTaskOperationPlan.cpp (.../TTaskOperationPlan.cpp) (revision e9926b6e83984d0f30bf2008b93874c7c483d95c) @@ -66,7 +66,7 @@ switch(eOperation) { case eOperation_None: - THROW_CORE_EXCEPTION_STR(eInvalidArgument, _T("Cannot set operation type 'none'")); + THROW_CORE_EXCEPTION(eErr_InvalidArgument); break; case eOperation_Copy: @@ -91,7 +91,7 @@ BOOST_STATIC_ASSERT(eOperation_Move == eOperation_Max - 1); default: - THROW_CORE_EXCEPTION_STR(eUnhandledCase, _T("Unhandled case")); + THROW_CORE_EXCEPTION(eErr_UnhandledCase); } m_eOperation = eOperation; @@ -113,7 +113,7 @@ { boost::shared_lock lock(m_lock); if(stIndex >= m_vSubOperations.size()) - THROW_CORE_EXCEPTION_STR(eBoundsExceeded, _T("Index out of bounds")); + THROW_CORE_EXCEPTION(eErr_BoundsExceeded); else return m_vSubOperations[stIndex].first; } @@ -122,7 +122,7 @@ { boost::shared_lock lock(m_lock); if(stIndex >= m_vSubOperations.size()) - THROW_CORE_EXCEPTION_STR(eBoundsExceeded, _T("Index out of bounds")); + THROW_CORE_EXCEPTION(eErr_BoundsExceeded); else return m_vSubOperations[stIndex].second; }