Suppress bunch of unused/uninitialized warnings

2 files changed, 6 insertions, 4 deletions

diff --git a/libodb/odb/nullable.hxx b/libodb/odb/nullable.hxx
index 75f5892..faa55c4 100644
--- a/libodb/odb/nullable.hxx
+++ b/libodb/odb/nullable.hxx
@@ -197,7 +197,7 @@ namespace odb
   nullable (const nullable& y)
       : null_ (y.null_)
   {
-    if (!null_)
+    if (!y.null_)
       new (&value_) T (y.value_);
   }
 
@@ -206,7 +206,7 @@ namespace odb
   nullable (nullable&& y)
       : null_ (y.null_)
   {
-    if (!null_)
+    if (!y.null_)
       new (&value_) T (std::move (y.value_));
   }
 
@@ -216,7 +216,7 @@ namespace odb
   nullable (const nullable<Y>& y)
       : null_ (y.null_)
   {
-    if (!null_)
+    if (!y.null_)
       new (&value_) T (y.value_);
   }
 
@@ -226,7 +226,7 @@ namespace odb
   nullable (nullable<Y>&& y)
       : null_ (y.null_)
   {
-    if (!null_)
+    if (!y.null_)
       new (&value_) T (std::move (y.value_));
   }
 
diff --git a/libodb/odb/transaction.cxx b/libodb/odb/transaction.cxx
index f75cf32..03810a1 100644
--- a/libodb/odb/transaction.cxx
+++ b/libodb/odb/transaction.cxx
@@ -5,6 +5,7 @@
 #include <odb/exceptions.hxx>
 
 #include <odb/details/tls.hxx>
+#include <odb/details/unused.hxx>
 
 using namespace std;
 
@@ -335,6 +336,7 @@ namespace odb
   connection& transaction_impl::
   connection (database_type* db)
   {
+    ODB_POTENTIALLY_UNUSED (db);
     assert (db == 0 || db == &database_);
     return *connection_;
   }