"git@developer.sourcefind.cn:OpenDAS/dlib.git" did not exist on "6f0feb2d5e4b15c496dfaac52f412323eeca4214"
Commit fdb2b7d0 authored by Davis King's avatar Davis King
Browse files

Moved serialize definition outside class since some compilers will fail to compile

friend functions when they aren't declared in this way.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403908
parent 00ee1128
...@@ -114,20 +114,12 @@ namespace dlib ...@@ -114,20 +114,12 @@ namespace dlib
friend void serialize( friend void serialize(
const rand_kernel_1& item, const rand_kernel_1& item,
std::ostream& out std::ostream& out
) );
{
serialize(item.mt, out);
serialize(item.seed, out);
}
friend void deserialize( friend void deserialize(
rand_kernel_1& item, rand_kernel_1& item,
std::istream& in std::istream& in
) );
{
deserialize(item.mt, in);
deserialize(item.seed, in);
}
private: private:
mt19937 mt; mt19937 mt;
...@@ -148,6 +140,23 @@ namespace dlib ...@@ -148,6 +140,23 @@ namespace dlib
static const bool value = true; static const bool value = true;
}; };
inline void serialize(
const rand_kernel_1& item,
std::ostream& out
)
{
serialize(item.mt, out);
serialize(item.seed, out);
}
inline void deserialize(
rand_kernel_1& item,
std::istream& in
)
{
deserialize(item.mt, in);
deserialize(item.seed, in);
}
} }
#endif // DLIB_RAND_KERNEl_1_ #endif // DLIB_RAND_KERNEl_1_
......
...@@ -218,6 +218,7 @@ namespace ...@@ -218,6 +218,7 @@ namespace
{ {
dlog << LINFO << "testing kernel_1a"; dlog << LINFO << "testing kernel_1a";
rand_test<dlib::rand::kernel_1a>(); rand_test<dlib::rand::kernel_1a>();
rand_test<dlib::rand::float_1a>();
} }
} a; } a;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment