5 files changed, 10 insertions, 15 deletions
diff --git a/odb/boost/uuid/mssql/uuid-traits.hxx b/odb/boost/uuid/mssql/uuid-traits.hxx
index 70efbb4..d92a5a9 100644
--- a/odb/boost/uuid/mssql/uuid-traits.hxx
+++ b/odb/boost/uuid/mssql/uuid-traits.hxx
@@ -13,10 +13,9 @@
 
 #include <odb/pre.hxx>
 
-#include <cstring> // std::memcpy
+#include <cstring> // std::memcpy, std::memset
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/nil_generator.hpp>
 
 #include <odb/mssql/traits.hxx>
 
@@ -38,7 +37,7 @@ namespace odb
         if (!is_null)
           std::memcpy (v.data, &i, 16);
         else
-          v = ::boost::uuids::nil_uuid ();
+          std::memset (v.data, 0, 16);
       }
 
       static void
diff --git a/odb/boost/uuid/mysql/uuid-traits.hxx b/odb/boost/uuid/mysql/uuid-traits.hxx
index 47d5fce..30af53f 100644
--- a/odb/boost/uuid/mysql/uuid-traits.hxx
+++ b/odb/boost/uuid/mysql/uuid-traits.hxx
@@ -13,11 +13,10 @@
 
 #include <odb/pre.hxx>
 
-#include <cstring> // std::memcpy
+#include <cstring> // std::memcpy, std::memset
 #include <cassert>
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/nil_generator.hpp>
 
 #include <odb/mysql/traits.hxx>
 
@@ -44,7 +43,7 @@ namespace odb
           std::memcpy (v.data, b.data (), 16);
         }
         else
-          v = ::boost::uuids::nil_uuid ();
+          std::memset (v.data, 0, 16);
       }
 
       static void
diff --git a/odb/boost/uuid/oracle/uuid-traits.hxx b/odb/boost/uuid/oracle/uuid-traits.hxx
index 822165f..1409203 100644
--- a/odb/boost/uuid/oracle/uuid-traits.hxx
+++ b/odb/boost/uuid/oracle/uuid-traits.hxx
@@ -13,11 +13,10 @@
 
 #include <odb/pre.hxx>
 
-#include <cstring> // std::memcpy
+#include <cstring> // std::memcpy, std::memset
 #include <cassert>
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/nil_generator.hpp>
 
 #include <odb/oracle/traits.hxx>
 
@@ -42,7 +41,7 @@ namespace odb
           std::memcpy (v.data, b, 16);
         }
         else
-          v = ::boost::uuids::nil_uuid ();
+          std::memset (v.data, 0, 16);
       }
 
       static void
diff --git a/odb/boost/uuid/pgsql/uuid-traits.hxx b/odb/boost/uuid/pgsql/uuid-traits.hxx
index 675452c..e42e60e 100644
--- a/odb/boost/uuid/pgsql/uuid-traits.hxx
+++ b/odb/boost/uuid/pgsql/uuid-traits.hxx
@@ -13,10 +13,9 @@
 
 #include <odb/pre.hxx>
 
-#include <cstring> // std::memcpy
+#include <cstring> // std::memcpy, std::memset
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/nil_generator.hpp>
 
 #include <odb/pgsql/traits.hxx>
 
@@ -38,7 +37,7 @@ namespace odb
         if (!is_null)
           std::memcpy (v.data, i, 16);
         else
-          v = ::boost::uuids::nil_uuid ();
+          std::memset (v.data, 0, 16);
       }
 
       static void
diff --git a/odb/boost/uuid/sqlite/uuid-traits.hxx b/odb/boost/uuid/sqlite/uuid-traits.hxx
index 2b11b4e..92d005c 100644
--- a/odb/boost/uuid/sqlite/uuid-traits.hxx
+++ b/odb/boost/uuid/sqlite/uuid-traits.hxx
@@ -13,11 +13,10 @@
 
 #include <odb/pre.hxx>
 
-#include <cstring> // std::memcpy
+#include <cstring> // std::memcpy, std::memset
 #include <cassert>
 
 #include <boost/uuid/uuid.hpp>
-#include <boost/uuid/nil_generator.hpp>
 
 #include <odb/sqlite/traits.hxx>
 
@@ -44,7 +43,7 @@ namespace odb
           std::memcpy (v.data, b.data (), 16);
         }
         else
-          v = ::boost::uuids::nil_uuid ();
+          std::memset (v.data, 0, 16);
       }
 
       static void