Implemented volumetric flow rate hints,

removed some C++11 conditioned compilation. Slic3r now requires C++11.

3 files changed, 2 insertions, 29 deletions

diff --git a/xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp b/xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp
index d03c1f208..aa9774784 100644
--- a/xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp
+++ b/xs/src/libslic3r/Fill/Fill3DHoneycomb.cpp
@@ -176,11 +176,7 @@ void Fill3DHoneycomb::_fill_surface_single(
             }
         }
         Polylines chained = PolylineCollection::chained_path_from(
-#if SLIC3R_CPPVER >= 11
             std::move(polylines), 
-#else
-            polylines,
-#endif
             PolylineCollection::leftmost_point(polylines), false); // reverse allowed
         bool first = true;
         for (Polylines::iterator it_polyline = chained.begin(); it_polyline != chained.end(); ++ it_polyline) {
@@ -199,12 +195,7 @@ void Fill3DHoneycomb::_fill_surface_single(
                 }
             }
             // The lines cannot be connected.
-#if SLIC3R_CPPVER >= 11
-            polylines_out.push_back(std::move(*it_polyline));
-#else
-            polylines_out.push_back(Polyline());
-            std::swap(polylines_out.back(), *it_polyline);
-#endif
+            polylines_out.emplace_back(std::move(*it_polyline));
             first = false;
         }
     }
diff --git a/xs/src/libslic3r/Fill/FillHoneycomb.cpp b/xs/src/libslic3r/Fill/FillHoneycomb.cpp
index 22dea85da..aa0e0f6b0 100644
--- a/xs/src/libslic3r/Fill/FillHoneycomb.cpp
+++ b/xs/src/libslic3r/Fill/FillHoneycomb.cpp
@@ -17,12 +17,7 @@ void FillHoneycomb::_fill_surface_single(
     CacheID cache_id(params.density, this->spacing);
     Cache::iterator it_m = this->cache.find(cache_id);
     if (it_m == this->cache.end()) {
-#if 0
-// #if SLIC3R_CPPVER > 11
-        it_m = this->cache.emplace_hint(it_m);
-#else
         it_m = this->cache.insert(it_m, std::pair<CacheID, CacheData>(cache_id, CacheData()));
-#endif
         CacheData &m = it_m->second;
         coord_t min_spacing = scale_(this->spacing);
         m.distance = min_spacing / params.density;
@@ -99,11 +94,7 @@ void FillHoneycomb::_fill_surface_single(
         // connect paths
         if (! paths.empty()) { // prevent calling leftmost_point() on empty collections
             Polylines chained = PolylineCollection::chained_path_from(
-#if SLIC3R_CPPVER >= 11
                 std::move(paths), 
-#else
-                paths,
-#endif
                 PolylineCollection::leftmost_point(paths), false);
             assert(paths.empty());
             paths.clear();
diff --git a/xs/src/libslic3r/Fill/FillRectilinear.cpp b/xs/src/libslic3r/Fill/FillRectilinear.cpp
index 991adc0b3..5ba30ba51 100644
--- a/xs/src/libslic3r/Fill/FillRectilinear.cpp
+++ b/xs/src/libslic3r/Fill/FillRectilinear.cpp
@@ -93,11 +93,7 @@ void FillRectilinear::_fill_surface_single(
             }
         }
         Polylines chained = PolylineCollection::chained_path_from(
-#if SLIC3R_CPPVER >= 11
             std::move(polylines), 
-#else
-            polylines,
-#endif
             PolylineCollection::leftmost_point(polylines), false); // reverse allowed
         bool first = true;
         for (Polylines::iterator it_polyline = chained.begin(); it_polyline != chained.end(); ++ it_polyline) {
@@ -118,12 +114,7 @@ void FillRectilinear::_fill_surface_single(
                 }
             }
             // The lines cannot be connected.
-#if SLIC3R_CPPVER >= 11
-            polylines_out.push_back(std::move(*it_polyline));
-#else
-            polylines_out.push_back(Polyline());
-            std::swap(polylines_out.back(), *it_polyline);
-#endif
+            polylines_out.emplace_back(std::move(*it_polyline));
             first = false;
         }
     }