From 5aee82f8d634739d8b1af602d804e76d962a2d56 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 9 Nov 2011 20:19:17 +0200
Subject: Make sure we can use same type as both container and simple value

---
 common/blob/driver.cxx | 3 +++
 common/blob/test.hxx   | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'common/blob')

diff --git a/common/blob/driver.cxx b/common/blob/driver.cxx
index 0c58deb..f123577 100644
--- a/common/blob/driver.cxx
+++ b/common/blob/driver.cxx
@@ -48,6 +48,9 @@ main (int argc, char* argv[])
     o.vuc.assign (udata, udata + sizeof (data));
     memcpy (o.c, data, sizeof (data));
     memcpy (o.uc, udata, sizeof (data));
+    o.cont.push_back (1);
+    o.cont.push_back (2);
+    o.cont.push_back (3);
 
     {
       transaction t (db->begin ());
diff --git a/common/blob/test.hxx b/common/blob/test.hxx
index 5fb501e..b1b7cf5 100644
--- a/common/blob/test.hxx
+++ b/common/blob/test.hxx
@@ -39,6 +39,10 @@ struct object
 
   #pragma db type(BLOB_TYPE)
   unsigned char uc[1024];
+
+  // Make sure we can still use std::vector<char> as a container.
+  //
+  std::vector<unsigned char> cont;
 };
 
 inline bool
@@ -49,7 +53,8 @@ operator== (const object& x, const object& y)
     x.vc == y.vc &&
     x.vuc == y.vuc &&
     std::memcmp (x.c, y.c, sizeof (x.c)) == 0 &&
-    std::memcmp (x.uc, y.uc, sizeof (x.uc)) == 0;
+    std::memcmp (x.uc, y.uc, sizeof (x.uc)) == 0 &&
+    x.cont == y.cont;
 }
 
 #endif // TEST_HXX
-- 
cgit v1.1