diff options
| author | Constantin Michael <constantin@codesynthesis.com> | 2011-05-27 10:59:14 +0200 |
|---|---|---|
| committer | Constantin Michael <constantin@codesynthesis.com> | 2011-05-27 10:59:14 +0200 |
| commit | 952b5dc4b93fae4f49465b87e977fc67a34b6098 (patch) | |
| tree | e7f33dc74cef818e1ec4f23d33fb7e45f07896e2 | |
| parent | cede94f24ef25804c979768e718b261f490df422 (diff) | |
Use oid enum instead of Oid libpq typedef to avoid libpq-fe.h dependencies
| -rw-r--r-- | odb/pgsql/statement.cxx | 12 | ||||
| -rw-r--r-- | odb/pgsql/statement.hxx | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/odb/pgsql/statement.cxx b/odb/pgsql/statement.cxx index e223b4e..98aecb9 100644 --- a/odb/pgsql/statement.cxx +++ b/odb/pgsql/statement.cxx @@ -45,7 +45,7 @@ namespace odb statement (connection& conn, const string& name, const string& stmt, - const Oid* types, + const oid* types, size_t types_count) : conn_ (conn), name_ (name) @@ -54,7 +54,7 @@ namespace odb name_.c_str (), stmt.c_str (), static_cast<int> (types_count), - types)); + reinterpret_cast<const Oid*> (types))); if (!is_good_result (r.get ())) translate_error (conn_, r.get ()); @@ -200,7 +200,7 @@ namespace odb select_statement (connection& conn, const std::string& name, const std::string& stmt, - const Oid* types, + const oid* types, std::size_t types_count, binding& cond, native_binding& native_cond, @@ -287,7 +287,7 @@ namespace odb insert_statement (connection& conn, const string& name, const string& stmt, - const Oid* types, + const oid* types, size_t types_count, binding& data, native_binding& native_data) @@ -352,7 +352,7 @@ namespace odb update_statement (connection& conn, const string& name, const string& stmt, - const Oid* types, + const oid* types, size_t types_count, binding& cond, native_binding& native_cond, @@ -409,7 +409,7 @@ namespace odb delete_statement (connection& conn, const string& name, const string& stmt, - const Oid* types, + const oid* types, size_t types_count, binding& cond, native_binding& native_cond) diff --git a/odb/pgsql/statement.hxx b/odb/pgsql/statement.hxx index a135643..3ed8116 100644 --- a/odb/pgsql/statement.hxx +++ b/odb/pgsql/statement.hxx @@ -18,6 +18,7 @@ #include <odb/pgsql/version.hxx> #include <odb/pgsql/binding.hxx> #include <odb/pgsql/result-ptr.hxx> +#include <odb/pgsql/pgsql-oid.hxx> #include <odb/pgsql/details/export.hxx> @@ -43,7 +44,7 @@ namespace odb statement (connection&, const std::string& name, const std::string& stmt, - const Oid* types, + const oid* types, std::size_t types_count); protected: @@ -79,7 +80,7 @@ namespace odb select_statement (connection& conn, const std::string& name, const std::string& stmt, - const Oid* types, + const oid* types, std::size_t types_count, binding& cond, native_binding& native_cond, @@ -137,7 +138,7 @@ namespace odb insert_statement (connection& conn, const std::string& name, const std::string& stmt, - const Oid* types, + const oid* types, std::size_t types_count, binding& data, native_binding& native_data); @@ -178,7 +179,7 @@ namespace odb update_statement (connection& conn, const std::string& name, const std::string& stmt, - const Oid* types, + const oid* types, std::size_t types_count, binding& cond, native_binding& native_cond, @@ -209,7 +210,7 @@ namespace odb delete_statement (connection& conn, const std::string& name, const std::string& stmt, - const Oid* types, + const oid* types, std::size_t types_count, binding& cond, native_binding& native_cond); |