3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-16 03:07:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Another compilation fix.

Browse source
This commit is contained in:
bubnikv 2017-10-17 18:41:54 +02:00
parent de2c6a2a3d
commit 9a7d1bb566
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/libslic3r/GCode/ToolOrdering.hpp
View file

@ -71,7 +71,7 @@ public:
const LayerTools& back() const { return m_layer_tools.back(); } const LayerTools& back() const { return m_layer_tools.back(); }
bool empty() const { return m_layer_tools.empty(); } bool empty() const { return m_layer_tools.empty(); }
const std::vector<LayerTools>& layer_tools() const { return m_layer_tools; } const std::vector<LayerTools>& layer_tools() const { return m_layer_tools; }
bool has_wipe_tower() const { return ! m_layer_tools.empty() && m_first_printing_extruder != (size_t)-1 && m_layer_tools.front().wipe_tower_partitions > 0; } bool has_wipe_tower() const { return ! m_layer_tools.empty() && m_first_printing_extruder != (unsigned int)-1 && m_layer_tools.front().wipe_tower_partitions > 0; }
private: private:
void initialize_layers(std::vector<coordf_t> &zs); void initialize_layers(std::vector<coordf_t> &zs);
@ -82,9 +82,9 @@ private:
std::vector<LayerTools> m_layer_tools; std::vector<LayerTools> m_layer_tools;
// First printing extruder, including the multi-material priming sequence. // First printing extruder, including the multi-material priming sequence.
unsigned int m_first_printing_extruder; unsigned int m_first_printing_extruder = (unsigned int)-1;
// Final printing extruder. // Final printing extruder.
unsigned int m_last_printing_extruder; unsigned int m_last_printing_extruder = (unsigned int)-1;
// All extruders, which extrude some material over m_layer_tools. // All extruders, which extrude some material over m_layer_tools.
std::vector<unsigned int> m_all_printing_extruders; std::vector<unsigned int> m_all_printing_extruders;
}; };

5
xs/src/libslic3r/libslic3r.h
View file

@ -92,6 +92,11 @@ inline std::string debug_out_path(const char *name, ...)
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
#endif /* UNUSED */ #endif /* UNUSED */
// Detect whether the compiler supports C++11 noexcept exception specifications.
#if defined(_MSC_VER) && _MSC_VER < 1900
#define noexcept throw()
#endif
// Write slices as SVG images into out directory during the 2D processing of the slices. // Write slices as SVG images into out directory during the 2D processing of the slices.
// #define SLIC3R_DEBUG_SLICE_PROCESSING // #define SLIC3R_DEBUG_SLICE_PROCESSING

2
xs/xsp/GCode.xsp
View file

@ -41,5 +41,5 @@
%}; %};
Ref<StaticPrintConfig> config() Ref<StaticPrintConfig> config()
%code{% RETVAL = const_cast<StaticPrintConfig*>(dynamic_cast<const StaticPrintConfig*>(&THIS->config())); %}; %code{% RETVAL = const_cast<StaticPrintConfig*>(static_cast<const PrintObjectConfig*>(&THIS->config())); %};
}; };