diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2021-05-24 18:54:36 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-05-24 20:22:45 +0300 |
| commit | f1716624e7ed6ad06944103c8e0d40ed40e0bf92 (patch) | |
| tree | 5b0f94f61ddec0c2154b177e33a254a3052cb40d | |
| parent | 2ac3e83cdb046e2863c9aaff56e8e1a9328a6f57 (diff) | |
Fix MinGW GCC's 'redeclared without dllimport attribute' warning
| -rw-r--r-- | odb/sqlite/connection.hxx | 5 | ||||
| -rw-r--r-- | odb/sqlite/connection.ixx | 8 | ||||
| -rw-r--r-- | odb/sqlite/database.hxx | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/odb/sqlite/connection.hxx b/odb/sqlite/connection.hxx index 366239f..dbe4494 100644 --- a/odb/sqlite/connection.hxx +++ b/odb/sqlite/connection.hxx @@ -336,10 +336,7 @@ namespace odb friend class transaction_impl; connection_factory& - main_factory () - { - return main_connection_->factory (); - } + main_factory (); // Note that this essentially establishes a "framework" for all the // attached connection factory implementations: they hold a counted diff --git a/odb/sqlite/connection.ixx b/odb/sqlite/connection.ixx index c0e49b9..094fd52 100644 --- a/odb/sqlite/connection.ixx +++ b/odb/sqlite/connection.ixx @@ -96,5 +96,13 @@ namespace odb // return prepare_query<T> (n, sqlite::query_base (q)); } + + // attached_connection_factory + // + inline connection_factory& attached_connection_factory:: + main_factory () + { + return main_connection_->factory (); + } } } diff --git a/odb/sqlite/database.hxx b/odb/sqlite/database.hxx index 614ed63..e7579d6 100644 --- a/odb/sqlite/database.hxx +++ b/odb/sqlite/database.hxx @@ -106,7 +106,7 @@ namespace odb // optimal translation performance use 4-character schema names. // // The main connection and attached to it databases and connections are - // all meant to be used withing the same thread. In particular, the + // all meant to be used within the same thread. In particular, the // attached database holds a counted reference to the main connection // which means the connection will not be released until all the // attached to this connection databases are destroyed. @@ -120,7 +120,7 @@ namespace odb // less flexible: the current model allows attaching a different set of // databases to different connections, attaching them on demand as the // transaction progresses, etc. Also, the more convenient model can be - // implemented on top this model by deriving an application-specific + // implemented on top of this model by deriving an application-specific // database class and/or providing custom connection factories. // // Note that unless the name is a URI with appropriate mode, it is |