Index: src/libchcore/TSQLiteSerializerRowReader.cpp =================================================================== diff -u -N -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3 -re8f31b0f922b402878356e130c866c4f3682a7f5 --- src/libchcore/TSQLiteSerializerRowReader.cpp (.../TSQLiteSerializerRowReader.cpp) (revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3) +++ src/libchcore/TSQLiteSerializerRowReader.cpp (.../TSQLiteSerializerRowReader.cpp) (revision e8f31b0f922b402878356e130c866c4f3682a7f5) @@ -34,7 +34,7 @@ m_strContainerName(strContainerName) { if (m_strContainerName.IsEmpty()) - THROW_CORE_EXCEPTION(eErr_InvalidArgument); + throw TCoreException(eErr_InvalidArgument, L"m_strContainerName", LOCATION); } TSQLiteSerializerRowReader::~TSQLiteSerializerRowReader() @@ -44,7 +44,7 @@ bool TSQLiteSerializerRowReader::Next() { if (m_rColumns.IsEmpty()) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"m_rColumns is empty", LOCATION); if (!m_bInitialized) { @@ -63,103 +63,103 @@ void TSQLiteSerializerRowReader::GetValue(const TString& strColName, bool& bValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), bValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, short& iValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), iValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, unsigned short& uiValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), uiValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, int& iValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), iValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, unsigned int& uiValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), uiValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, long& lValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), lValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, unsigned long& ulValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), ulValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, long long& llValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), llValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, unsigned long long& ullValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), ullValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, double& dValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), dValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, TString& strValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), strValue); } void TSQLiteSerializerRowReader::GetValue(const TString& strColName, TSmartPath& pathValue) { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); m_spStatement->GetValue(GetColumnIndex(strColName), pathValue); } int TSQLiteSerializerRowReader::GetColumnIndex(const TString& strColName) const { if (!m_bInitialized) - THROW_CORE_EXCEPTION(eErr_SerializeLoadError); + throw TCoreException(eErr_SerializeLoadError, L"Serializer not initialized", LOCATION); size_t stColumn = m_rColumns.GetColumnIndex(strColName.c_str()); return boost::numeric_cast(stColumn);