3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplified the "cereal" includes to not clash with Perl includes

Browse Source
This commit is contained in:
bubnikv 2019-07-04 22:09:14 +02:00
parent 3d420db531
commit 9fd0c55eb8
9 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/BoundingBox.hpp
View File

@ -161,9 +161,6 @@ inline bool empty(const BoundingBox3Base<VT> &bb)
} // namespace Slic3r
#include <cereal/types/polymorphic.hpp>
#include <cereal/archives/binary.hpp>
// Serialization through the Cereal library
namespace cereal {
template<class Archive> void serialize(Archive& archive, Slic3r::BoundingBox &bb) { archive(bb.min, bb.max, bb.defined); }

1
src/libslic3r/Config.cpp
View File

@ -822,6 +822,7 @@ t_config_option_keys StaticConfig::keys() const
}
#include <cereal/types/polymorphic.hpp>
CEREAL_REGISTER_TYPE(Slic3r::ConfigOption)
CEREAL_REGISTER_TYPE(Slic3r::ConfigOptionSingle<double>)
CEREAL_REGISTER_TYPE(Slic3r::ConfigOptionSingle<int>)

7
src/libslic3r/Config.hpp
View File

@ -18,11 +18,8 @@
#include <boost/format.hpp>
#include <boost/property_tree/ptree.hpp>
#include <cereal/types/polymorphic.hpp>
#include <cereal/types/map.hpp>
#include <cereal/types/string.hpp>
#include <cereal/types/vector.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/access.hpp>
#include <cereal/types/base_class.hpp>
namespace Slic3r {

3
src/libslic3r/Geometry.hpp
View File

@ -8,8 +8,7 @@
#include "Polyline.hpp"
// Serialization through the Cereal library
#include <cereal/types/polymorphic.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/access.hpp>
#include "boost/polygon/voronoi.hpp"
using boost::polygon::voronoi_builder;

6
src/libslic3r/ObjectID.hpp
View File

@ -1,11 +1,7 @@
#ifndef slic3r_ObjectID_hpp_
#define slic3r_ObjectID_hpp_
#include <cereal/types/polymorphic.hpp>
#include <cereal/types/map.hpp>
#include <cereal/types/string.hpp>
#include <cereal/types/vector.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/access.hpp>
namespace Slic3r {

3
src/libslic3r/Point.hpp
View File

@ -291,9 +291,6 @@ namespace boost { namespace polygon {
} }
// end Boost
#include <cereal/types/polymorphic.hpp>
#include <cereal/archives/binary.hpp>
// Serialization through the Cereal library
namespace cereal {
// template<class Archive> void serialize(Archive& archive, Slic3r::Vec2crd &v) { archive(v.x(), v.y()); }

1
src/libslic3r/PrintConfig.cpp
View File

@ -3198,5 +3198,6 @@ void DynamicPrintAndCLIConfig::handle_legacy(t_config_option_key &opt_key, std::
}
#include <cereal/types/polymorphic.hpp>
CEREAL_REGISTER_TYPE(Slic3r::DynamicPrintConfig)
CEREAL_REGISTER_POLYMORPHIC_RELATION(Slic3r::DynamicConfig, Slic3r::DynamicPrintConfig)

8
src/libslic3r/pchheader.hpp
View File

@ -102,12 +102,8 @@
#include <Eigen/Dense>
#include <Eigen/Geometry>
#include <cereal/types/polymorphic.hpp>
#include <cereal/types/map.hpp>
#include <cereal/types/memory.hpp>
#include <cereal/types/string.hpp>
#include <cereal/types/vector.hpp>
#include <cereal/archives/binary.hpp>
#include <cereal/access.hpp>
#include <cereal/types/base_class.hpp>
#include "BoundingBox.hpp"
#include "ClipperUtils.hpp"

1
xs/src/xsinit.h
View File

@ -87,7 +87,6 @@ extern "C" {
#endif /* _MSC_VER */
#undef Zero
#undef Packet
#undef ST
#undef _
}
#endif