diff options
| author | George Hazan <ghazan@miranda.im> | 2018-12-18 15:40:58 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-12-18 15:40:58 +0300 |
| commit | 0e854af70f6f330e63aa36fde125fbb0ca4ff8ef (patch) | |
| tree | d681b5e06a8c572c13d82d0b49b54860fb896843 /plugins/Dbx_sqlite | |
| parent | d60f86e09f10ab4d55b94c6193b3bb3d3ca46b18 (diff) | |
C++ exceptions are disabled in all cases where they just prevent warnings
Diffstat (limited to 'plugins/Dbx_sqlite')
| -rw-r--r-- | plugins/Dbx_sqlite/dbx_sqlite.vcxproj | 1 | ||||
| -rw-r--r-- | plugins/Dbx_sqlite/src/dbevents.cpp | 12 | ||||
| -rw-r--r-- | plugins/Dbx_sqlite/src/stdafx.h | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Dbx_sqlite/dbx_sqlite.vcxproj b/plugins/Dbx_sqlite/dbx_sqlite.vcxproj index a49f988021..028d343eea 100644 --- a/plugins/Dbx_sqlite/dbx_sqlite.vcxproj +++ b/plugins/Dbx_sqlite/dbx_sqlite.vcxproj @@ -32,7 +32,6 @@ </ImportGroup> <ItemDefinitionGroup> <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> <AdditionalIncludeDirectories>$(ProjectDir)..\..\libs\sqlite3\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> </ItemDefinitionGroup> diff --git a/plugins/Dbx_sqlite/src/dbevents.cpp b/plugins/Dbx_sqlite/src/dbevents.cpp index ba4e91236d..52451b4327 100644 --- a/plugins/Dbx_sqlite/src/dbevents.cpp +++ b/plugins/Dbx_sqlite/src/dbevents.cpp @@ -574,9 +574,9 @@ MEVENT CDbxSQLite::FindNextEvent(MCONTACT hContact, MEVENT hDbEvent) in.Append(")"); CMStringA query(FORMAT, "select id from events where contact_id in %s and id <> %lu and timestamp > (select timestamp from events where contact_id in %s and id = %lu limit 1) order by timestamp, id limit 1;", - in, + in.c_str(), hDbEvent, - in, + in.c_str(), hDbEvent); sqlite3_stmt *stmt; @@ -628,9 +628,9 @@ MEVENT CDbxSQLite::FindPrevEvent(MCONTACT hContact, MEVENT hDbEvent) in.Append(")"); CMStringA query(FORMAT, "select id from events where contact_id in %s and id <> %lu and timestamp < (select timestamp from events where contact_id in %s and id = %lu limit 1) order by timestamp desc, id desc limit 1;", - in, + in.c_str(), hDbEvent, - in, + in.c_str(), hDbEvent); sqlite3_stmt *stmt; @@ -695,12 +695,12 @@ BOOL CDbxSQLite::SetEventId(LPCSTR, MEVENT hDbEvent, LPCSTR szId) return (rc != SQLITE_DONE); } -BOOL CDbxSQLite::MetaMergeHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) +BOOL CDbxSQLite::MetaMergeHistory(DBCachedContact*, DBCachedContact*) { return TRUE; } -BOOL CDbxSQLite::MetaSplitHistory(DBCachedContact *ccMeta, DBCachedContact *ccSub) +BOOL CDbxSQLite::MetaSplitHistory(DBCachedContact*, DBCachedContact*) { return TRUE; }
\ No newline at end of file diff --git a/plugins/Dbx_sqlite/src/stdafx.h b/plugins/Dbx_sqlite/src/stdafx.h index 91d20b4109..a73a36ef53 100644 --- a/plugins/Dbx_sqlite/src/stdafx.h +++ b/plugins/Dbx_sqlite/src/stdafx.h @@ -5,6 +5,7 @@ #include <memory> +#include <malloc.h> #include <newpluginapi.h> #include <win2k.h> #include <assert.h> |