aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThéophane Hufschmitt <theophane.hufschmitt@tweag.io>2022-04-21 09:40:55 +0200
committerThéophane Hufschmitt <theophane.hufschmitt@tweag.io>2022-04-21 09:40:55 +0200
commite7d79c78616425cbbea6619ea28ea9a5ec75cabe (patch)
treee582ad7216a8aa22f9ee492783f686c9d78e7c3f
parent9345b4e9ca1b14071b471851508b37edfc2d1248 (diff)
Make the default SQLiteError constructor public
Otherwise the clang builds fail because the constructor of `SQLiteBusy` inherits it, `SQLiteError::_throw` tries to call it, which fails. Strangely, gcc works fine with it. Not sure what the correct behavior is and who is buggy here, but either way, making it public is at the worst a reasonable workaround
-rw-r--r--src/libstore/sqlite.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/sqlite.hh b/src/libstore/sqlite.hh
index 3a4ad8633..1d1c553ea 100644
--- a/src/libstore/sqlite.hh
+++ b/src/libstore/sqlite.hh
@@ -106,10 +106,10 @@ struct SQLiteError : Error
throw_(db, hintfmt(fs, args...));
}
-protected:
-
SQLiteError(const char *path, int errNo, int extendedErrNo, hintformat && hf);
+protected:
+
template<typename... Args>
SQLiteError(const char *path, int errNo, int extendedErrNo, const std::string & fs, const Args & ... args)
: SQLiteError(path, errNo, extendedErrNo, hintfmt(fs, args...))