aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-09-06 14:22:47 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-09-06 14:22:47 +0200
commit404ef5ab95820f49df26b5b41ecec0db83105e17 (patch)
treef6243e1655ee3cf8440898bbb77c90a3f3d54443
parent918b670c281d6c481a898184c3d9699ed641fd1e (diff)
Resolve export warnings
-rw-r--r--odb/mysql/query.hxx12
-rw-r--r--odb/mysql/transaction.ixx20
2 files changed, 16 insertions, 16 deletions
diff --git a/odb/mysql/query.hxx b/odb/mysql/query.hxx
index 8e1d241..7d2d2d4 100644
--- a/odb/mysql/query.hxx
+++ b/odb/mysql/query.hxx
@@ -201,7 +201,7 @@ namespace odb
std::vector<MYSQL_BIND> binding_;
};
- inline LIBODB_MYSQL_EXPORT query
+ inline query
operator+ (const query& x, const query& y)
{
query r (x);
@@ -247,7 +247,7 @@ namespace odb
return r;
}
- inline LIBODB_MYSQL_EXPORT query
+ inline query
operator+ (const query& q, const std::string& s)
{
query r (q);
@@ -255,7 +255,7 @@ namespace odb
return r;
}
- inline LIBODB_MYSQL_EXPORT query
+ inline query
operator+ (const std::string& s, const query& q)
{
query r (s);
@@ -301,7 +301,7 @@ namespace odb
return r;
}
- inline LIBODB_MYSQL_EXPORT query
+ inline query
operator&& (const query& x, const query& y)
{
query r ("(");
@@ -312,7 +312,7 @@ namespace odb
return r;
}
- inline LIBODB_MYSQL_EXPORT query
+ inline query
operator|| (const query& x, const query& y)
{
query r ("(");
@@ -323,7 +323,7 @@ namespace odb
return r;
}
- inline LIBODB_MYSQL_EXPORT query
+ inline query
operator! (const query& x)
{
query r ("!(");
diff --git a/odb/mysql/transaction.ixx b/odb/mysql/transaction.ixx
index d4f7cc8..b270fcf 100644
--- a/odb/mysql/transaction.ixx
+++ b/odb/mysql/transaction.ixx
@@ -16,6 +16,16 @@ namespace odb
{
}
+ inline transaction_impl& transaction::
+ implementation ()
+ {
+ // We can use static_cast here since we have an instance of
+ // mysql::transaction.
+ //
+ return static_cast<transaction_impl&> (
+ odb::transaction::implementation ());
+ }
+
inline transaction::database_type& transaction::
database ()
{
@@ -27,15 +37,5 @@ namespace odb
{
return implementation ().connection ();
}
-
- inline transaction_impl& transaction::
- implementation ()
- {
- // We can use static_cast here since we have an instance of
- // mysql::transaction.
- //
- return static_cast<transaction_impl&> (
- odb::transaction::implementation ());
- }
}
}