juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-05 19:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trying to make all C++ of the platforms happy.

Browse Source
This commit is contained in:
bubnikv
2019-07-04 22:52:33 +02:00
parent 9fd0c55eb8
commit 211d1ee1e3
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libslic3r/ObjectID.hpp
View File

@@ -69,7 +69,6 @@ protected:
void assign_new_unique_ids_recursive() { this->set_new_unique_id(); }
private:
friend class UndoRedo::StackImpl;
ObjectID m_id;
static inline ObjectID generate_new_id() { return ObjectID(++ s_last_id); }
@@ -77,9 +76,9 @@ private:
friend ObjectID wipe_tower_object_id();
friend ObjectID wipe_tower_instance_id();
friend class Slic3r::UndoRedo::StackImpl;
friend class cereal::access;
friend class Slic3r::UndoRedo::StackImpl;
template<class Archive> void serialize(Archive &ar) { ar(m_id); }
ObjectBase(const ObjectID id) : m_id(id) {}
template<class Archive> static void load_and_construct(Archive & ar, cereal::construct<ObjectBase> &construct) { ObjectID id; ar(id); construct(id); }