diff options
| author | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-09-12 12:10:34 -0700 |
|---|---|---|
| committer | Asheem Mamoowala <asheem.mamoowala@mapbox.com> | 2018-09-12 12:10:34 -0700 |
| commit | a2e135838c9bc6c1f9925e88e662daf044283da7 (patch) | |
| tree | 234d6267423bc51692d733269ba8df363f98a376 | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-upstream/fix-sqlite-log-crash.tar.gz | |
Use named function instead of lambda for SQlite3 log configupstream/fix-sqlite-log-crash
| -rw-r--r-- | platform/default/sqlite3.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/platform/default/sqlite3.cpp b/platform/default/sqlite3.cpp index faaa85efd8..f7c6efc10d 100644 --- a/platform/default/sqlite3.cpp +++ b/platform/default/sqlite3.cpp @@ -97,6 +97,13 @@ public: template <typename T> using optional = std::experimental::optional<T>; + +#ifndef NDEBUG +void logSqlMessage(void *, const int err, const char *msg) { + mbgl::Log::Record(mbgl::EventSeverity::Debug, mbgl::Event::Database, err, "%s", msg); +} +#endif + __attribute__((constructor)) static void initalize() { if (sqlite3_libversion_number() / 1000000 != SQLITE_VERSION_NUMBER / 1000000) { @@ -109,9 +116,7 @@ static void initalize() { #ifndef NDEBUG // Enable SQLite logging before initializing the database. - sqlite3_config(SQLITE_CONFIG_LOG, [](void *, const int err, const char *msg) { - mbgl::Log::Record(mbgl::EventSeverity::Debug, mbgl::Event::Database, err, "%s", msg); - }, nullptr); + sqlite3_config(SQLITE_CONFIG_LOG, &logSqlMessage, nullptr); #endif } |