NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SERIALIZATION] support for std::optional (#2364)

Browse Source 
* added support for std::optional if using C++

* oops, bug fix + check if item already holds a type

* oops, another bug fix

* remove warnings about unused parameters

Co-authored-by: pf <pf@me>
This commit is contained in:
pfeatherstone 2021-05-11 12:56:34 +01:00 committed by GitHub
parent 11212a94b4
commit 9697fa5de2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlib/serialize.h
View File

@ -90,6 +90,7 @@
- std::unique_ptr
- std::shared_ptr
- std::variant (if C++17 is used)
- std::optional (if C++17 is used)
- dlib::uint64
- dlib::int64
- float_details
@ -121,6 +122,7 @@
- std::unique_ptr
- std::shared_ptr
- std::variant (if C++17 is used)
- std::optional (if C++17 is used)
- dlib::uint64
- dlib::int64
- float_details
@ -237,6 +239,7 @@
#include <utility>
#if __cplusplus >= 201703L
#include <variant>
#include <optional>
#endif
#include "uintn.h"
#include "interfaces/enumerable.h"
@ -1272,6 +1275,29 @@ namespace dlib
detail::deserialize_variant_helper(item, in, index);
}
template<typename T>
void serialize(const std::optional<T>& item, std::ostream& out)
{
serialize(item.has_value(), out);
if (item)
serialize(item.value(), out);
}
template <typename T>
void deserialize(std::optional<T>& item, std::istream& in)
{
bool has_value = false;
deserialize(has_value, in);
if (has_value)
{
deserialize(item.has_value() ? item.value() : item.emplace(), in);
}
else
{
item.reset();
}
}
#endif
// ----------------------------------------------------------------------------------------

12
dlib/test/serialize.cpp
View File

@ -422,9 +422,9 @@ namespace
immutable_type(immutable_type&& other) = delete;
immutable_type& operator=(immutable_type&& other) = delete;
friend void serialize(const immutable_type& x, std::ostream& out) {}
friend void deserialize(immutable_type& x, std::istream& in) {}
bool operator==(const immutable_type& other) const {return true;}
friend void serialize(const immutable_type&, std::ostream&) {}
friend void deserialize(immutable_type&, std::istream&) {}
bool operator==(const immutable_type&) const {return true;}
};
struct my_custom_type
@ -449,12 +449,13 @@ namespace
std::vector<std::complex<double>> p;
#if __cplusplus >= 201703L
std::variant<int,float,std::string,immutable_type> q;
std::optional<std::vector<std::string>> r;
#endif
bool operator==(const my_custom_type& rhs) const
{
#if __cplusplus >= 201703L
const bool cpp17_ok = q == rhs.q;
const bool cpp17_ok = std::tie(q, r) == std::tie(rhs.q, rhs.r);
#else
const bool cpp17_ok = true;
#endif
@ -465,7 +466,7 @@ namespace
}
#if __cplusplus >= 201703L
DLIB_DEFINE_DEFAULT_SERIALIZATION(my_custom_type, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, ptr_shared1, ptr_shared2, q);
DLIB_DEFINE_DEFAULT_SERIALIZATION(my_custom_type, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, ptr_shared1, ptr_shared2, q, r);
#else
DLIB_DEFINE_DEFAULT_SERIALIZATION(my_custom_type, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, ptr_shared1, ptr_shared2);
#endif
@ -1152,6 +1153,7 @@ namespace
t1.p.push_back(rng.get_random_gaussian());
#if __cplusplus >= 201703L
t1.q = "hello there from std::variant, welcome!";
t1.r = {"hello from optional vector of string"};
#endif
t2.a = 2;
t2.b = 4.0;