aboutsummaryrefslogtreecommitdiff
path: root/odb
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-09-14 12:49:07 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-09-14 12:49:07 +0200
commitc3a22b9fc707fc9c07096515563e4dd140a335d7 (patch)
treea5cfaf6820a4ebe29dba1bf74c6dc540a14bc280 /odb
parent2740ab92f2e9d6dd31e600f9e15ce4e3bbb008b9 (diff)
Use memset instead of nil_generator
The nil_generator.hpp header is not available in earlier versions.
Diffstat (limited to 'odb')
-rw-r--r--odb/boost/uuid/mssql/uuid-traits.hxx5
-rw-r--r--odb/boost/uuid/mysql/uuid-traits.hxx5
-rw-r--r--odb/boost/uuid/oracle/uuid-traits.hxx5
-rw-r--r--odb/boost/uuid/pgsql/uuid-traits.hxx5
-rw-r--r--odb/boost/uuid/sqlite/uuid-traits.hxx5
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