generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-07 19:44:45 +02:00
Code Issues Projects Releases Wiki Activity

Backport patches (#2006)

Browse Source 
* Guard SQLITE_BUSY_SNAPSHOT which is not available in older SQLite releases

When building POCO unbundled with older versions of SQLite (such as on RHEL7)
SQLITE_BUSY_SNAPSHOT is not defined, so #ifdef guard it.

* Some of the samples need to link with PocoJSON

* Build parallelization issues #1730

* Fix building XMLStreamParser with unbundled expat
This commit is contained in:
Scott Talbert
2017-11-20 10:31:20 -05:00
committed by Aleksandar Fabijanic
parent 6cdf579b48
commit 1724e8ba53
7 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/SQLite/src/Utility.cpp
View File

@@ -167,7 +167,9 @@ void Utility::throwException(int rc, const std::string& addErrMsg)
throw ExecutionAbortedException(std::string("Callback routine requested an abort"), addErrMsg);
case SQLITE_BUSY:
case SQLITE_BUSY_RECOVERY:
#if defined(SQLITE_BUSY_SNAPSHOT)
case SQLITE_BUSY_SNAPSHOT:
#endif
throw DBLockedException(std::string("The database file is locked"), addErrMsg);
case SQLITE_LOCKED:
throw TableLockedException(std::string("A table in the database is locked"), addErrMsg);