refactor: standardize object type identification using uLibTypeMacro and update serialization macros
This commit is contained in:
@@ -28,6 +28,8 @@
|
||||
|
||||
#include <boost/archive/detail/basic_pointer_iserializer.hpp>
|
||||
#include <boost/archive/detail/basic_pointer_oserializer.hpp>
|
||||
#include <boost/archive/text_oarchive.hpp>
|
||||
#include <cstring>
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/archive/text_iarchive.hpp>
|
||||
@@ -309,18 +311,32 @@ namespace Archive {
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// XML //
|
||||
|
||||
// ULIB_SERIALIZATION_VERSION should be get from the build system
|
||||
#ifndef ULIB_SERIALIZATION_VERSION
|
||||
#define ULIB_SERIALIZATION_VERSION "0.0"
|
||||
#endif
|
||||
|
||||
class xml_iarchive : public boost::archive::xml_iarchive_impl<xml_iarchive> {
|
||||
typedef xml_iarchive Archive;
|
||||
typedef boost::archive::xml_iarchive_impl<Archive> base;
|
||||
|
||||
unsigned int m_flags;
|
||||
|
||||
// give serialization implementation access to this class
|
||||
friend class boost::archive::detail::interface_iarchive<Archive>;
|
||||
friend class boost::archive::basic_xml_iarchive<Archive>;
|
||||
friend class boost::archive::load_access;
|
||||
|
||||
public:
|
||||
xml_iarchive(std::istream &is, unsigned int flags = 0)
|
||||
: xml_iarchive_impl<xml_iarchive>(is, flags) {}
|
||||
: boost::archive::xml_iarchive_impl<xml_iarchive>(
|
||||
is, flags | boost::archive::no_header), m_flags(flags) {
|
||||
if (0 == (flags & boost::archive::no_header)) {
|
||||
std::string line;
|
||||
std::getline(is, line); // <?xml ... ?>
|
||||
std::getline(is, line); // <!DOCTYPE ...>
|
||||
std::getline(is, line); // <ulib_serialization ...>
|
||||
}
|
||||
}
|
||||
|
||||
using basic_xml_iarchive::load_override;
|
||||
|
||||
@@ -368,14 +384,31 @@ class xml_oarchive : public boost::archive::xml_oarchive_impl<xml_oarchive> {
|
||||
typedef xml_oarchive Archive;
|
||||
typedef boost::archive::xml_oarchive_impl<Archive> base;
|
||||
|
||||
unsigned int m_flags;
|
||||
|
||||
// give serialization implementation access to this class
|
||||
friend class boost::archive::detail::interface_oarchive<Archive>;
|
||||
friend class boost::archive::basic_xml_oarchive<Archive>;
|
||||
friend class boost::archive::save_access;
|
||||
|
||||
public:
|
||||
xml_oarchive(std::ostream &os, unsigned int flags = 0)
|
||||
: boost::archive::xml_oarchive_impl<xml_oarchive>(os, flags) {}
|
||||
: boost::archive::xml_oarchive_impl<xml_oarchive>(
|
||||
os, flags | boost::archive::no_header), m_flags(flags) {
|
||||
if (0 == (flags & boost::archive::no_header)) {
|
||||
this->This()->put(
|
||||
"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\" ?>\n");
|
||||
this->This()->put("<!DOCTYPE ulib_serialization>\n");
|
||||
this->This()->put("<ulib_serialization signature=\"serialization::archive\" ");
|
||||
this->write_attribute("version", (const char *)ULIB_SERIALIZATION_VERSION);
|
||||
this->This()->put(">\n");
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~xml_oarchive() {
|
||||
if (0 == (m_flags & boost::archive::no_header)) {
|
||||
this->This()->put("</ulib_serialization>\n");
|
||||
}
|
||||
}
|
||||
|
||||
using basic_xml_oarchive::save_override;
|
||||
|
||||
@@ -397,8 +430,6 @@ public:
|
||||
// Do not save any human decoration string //
|
||||
// basic_text_oprimitive::save(str);
|
||||
}
|
||||
|
||||
virtual ~xml_oarchive() {}
|
||||
};
|
||||
|
||||
// typedef boost::archive::detail::polymorphic_oarchive_route<
|
||||
|
||||
Reference in New Issue
Block a user