diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2010-08-30 15:51:23 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2010-08-30 15:51:23 +0200 |
| commit | 1692b3e82521e7d73a908f532eced90491e1eded (patch) | |
| tree | c45272faba67485f3702395f43282a81a981cf5f /odb/mysql/query.hxx | |
| parent | 4452be925b749572f0e3edcb21e9af818647eb55 (diff) | |
Support for automake and VC++ builds
Diffstat (limited to 'odb/mysql/query.hxx')
| -rw-r--r-- | odb/mysql/query.hxx | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/odb/mysql/query.hxx b/odb/mysql/query.hxx index b09442c..5dd4339 100644 --- a/odb/mysql/query.hxx +++ b/odb/mysql/query.hxx @@ -6,7 +6,18 @@ #ifndef ODB_MYSQL_QUERY_HXX #define ODB_MYSQL_QUERY_HXX -#include <mysql/mysql.h> +#include <odb/pre.hxx> + +#include <odb/mysql/details/config.hxx> + +#ifdef LIBODB_MYSQL_INCLUDE_SHORT +# ifdef _WIN32 +# include <winsock2.h> +# endif +# include <mysql.h> +#else +# include <mysql/mysql.h> +#endif #include <string> #include <vector> @@ -21,6 +32,8 @@ #include <odb/details/buffer.hxx> #include <odb/details/shared-ptr.hxx> +#include <odb/mysql/details/export.hxx> + namespace odb { namespace mysql @@ -45,7 +58,7 @@ namespace odb const T& ref; }; - struct query_param: details::shared_base + struct LIBODB_MYSQL_EXPORT query_param: details::shared_base { virtual ~query_param (); @@ -77,7 +90,7 @@ namespace odb template <typename T, image_id_type ID> struct query_column; - class query + class LIBODB_MYSQL_EXPORT query { public: query () @@ -187,7 +200,7 @@ namespace odb std::vector<MYSQL_BIND> binding_; }; - inline query + inline LIBODB_MYSQL_EXPORT query operator+ (const query& x, const query& y) { query r (x); @@ -233,7 +246,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator+ (const query& q, const std::string& s) { query r (q); @@ -241,7 +254,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator+ (const std::string& s, const query& q) { query r (s); @@ -287,7 +300,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator&& (const query& x, const query& y) { query r ("("); @@ -298,7 +311,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator|| (const query& x, const query& y) { query r ("("); @@ -309,7 +322,7 @@ namespace odb return r; } - inline query + inline LIBODB_MYSQL_EXPORT query operator! (const query& x) { query r ("!("); @@ -1622,4 +1635,6 @@ namespace odb #include <odb/mysql/query.ixx> #include <odb/mysql/query.txx> +#include <odb/post.hxx> + #endif // ODB_MYSQL_QUERY_HXX |