mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
beast cleanup and tidying:
* Replace custom types with C++11 <cstdint> types * Fix sqlite integer intos and uses * Fix String implicit integer constructors * Escape the enclosing namespace in sqdb * Replace contract checks with assert * Make many header files compile independently * Remove the dependence on beast_core.h in many places * Remove unused or obsolete classes and functions * Remove unused or obsolete macros * Remove unused network functions and files * Remove unused or obsolete classes: - ChildProcess - HighResolutionTimer - InterProcessLock - Throw - TrackedMutex - UntrackedMutex - XmlDocument - XmlElement
This commit is contained in:
@@ -57,11 +57,9 @@
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
namespace sqdb
|
||||
{
|
||||
|
||||
namespace detail
|
||||
{
|
||||
namespace beast {
|
||||
namespace sqdb {
|
||||
namespace detail {
|
||||
|
||||
/*
|
||||
|
||||
@@ -172,7 +170,7 @@ void statement_imp::prepare(std::string const& query, bool bRepeatable)
|
||||
}
|
||||
else
|
||||
{
|
||||
Throw(detail::sqliteError(__FILE__, __LINE__, result));
|
||||
throw detail::sqliteError(__FILE__, __LINE__, result);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,7 +178,7 @@ Error statement_imp::execute()
|
||||
{
|
||||
Error error;
|
||||
|
||||
check_precondition (m_stmt != nullptr);
|
||||
assert (m_stmt != nullptr);
|
||||
|
||||
// ???
|
||||
m_bGotData = false;
|
||||
@@ -252,7 +250,7 @@ bool statement_imp::fetch(Error& error)
|
||||
else
|
||||
{
|
||||
// should never get SQLITE_OK here
|
||||
fatal_error ("invalid result");
|
||||
throw std::invalid_argument ("invalid result");
|
||||
}
|
||||
|
||||
return m_bGotData;
|
||||
@@ -275,7 +273,7 @@ void statement_imp::do_uses()
|
||||
sqlite3_clear_bindings(m_stmt));
|
||||
|
||||
if (error)
|
||||
Throw(error);
|
||||
throw error;
|
||||
|
||||
for (uses_t::iterator iter = m_uses.begin(); iter != m_uses.end(); ++iter)
|
||||
(*iter)->do_use();
|
||||
@@ -305,6 +303,6 @@ rowid statement_imp::last_insert_rowid()
|
||||
return m_last_insert_rowid;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
} // detail
|
||||
} // sqdb
|
||||
} // beast
|
||||
|
||||
Reference in New Issue
Block a user