From 5a6e85d92fa0f46a329ea8603e150c7e8da4097f Mon Sep 17 00:00:00 2001 From: Constantin Michael Date: Thu, 27 Oct 2011 12:52:41 +0200 Subject: Rename typedef type for clarity --- common/query/driver.cxx | 2 +- common/query/test.hxx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'common') diff --git a/common/query/driver.cxx b/common/query/driver.cxx index 3108158..6d41297 100644 --- a/common/query/driver.cxx +++ b/common/query/driver.cxx @@ -41,7 +41,7 @@ const char* key_data[] = { "\x23\x03\x15", "\x13\x13\x54", "\x08\x62\x35" }; int main (int argc, char* argv[]) { - vector + buffer key1 (key_data[0], key_data[0] + 3), key2 (key_data[1], key_data[1] + 3), key3 (key_data[2], key_data[2] + 3); diff --git a/common/query/test.hxx b/common/query/test.hxx index eab7048..d2d28d2 100644 --- a/common/query/test.hxx +++ b/common/query/test.hxx @@ -16,7 +16,8 @@ #include // DATABASE_XXX -typedef odb::nullable > nullable_vector; +typedef std::vector buffer; +typedef odb::nullable nullable_buffer; #pragma db object struct person @@ -26,7 +27,7 @@ struct person const std::string& ln, unsigned short age, bool married, - const nullable_vector& public_key = nullable_vector ()) + const nullable_buffer& public_key = nullable_buffer ()) : id_ (id), first_name_ (fn), last_name_ (ln), @@ -60,7 +61,7 @@ struct person #else #pragma db column ("key") type ("BLOB") null #endif - nullable_vector public_key_; + nullable_buffer public_key_; }; inline std::ostream& -- cgit v1.1