From 1a79352bf17262c80936269e572536b40a2a5c80 Mon Sep 17 00:00:00 2001 From: FormerLurker Date: Sat, 24 Oct 2020 11:53:22 -0500 Subject: Move constructor defaults to .h for clang support. --- ArcWelder/segmented_arc.cpp | 2 +- ArcWelder/segmented_arc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArcWelder/segmented_arc.cpp b/ArcWelder/segmented_arc.cpp index 297304b..591d616 100644 --- a/ArcWelder/segmented_arc.cpp +++ b/ArcWelder/segmented_arc.cpp @@ -36,7 +36,7 @@ segmented_arc::segmented_arc() : segmented_shape(DEFAULT_MIN_SEGMENTS, DEFAULT_M max_radius_mm_ = DEFAULT_MAX_RADIUS_MM; } -segmented_arc::segmented_arc(int min_segments = DEFAULT_MIN_SEGMENTS, int max_segments = DEFAULT_MAX_SEGMENTS, double resolution_mm = DEFAULT_RESOLUTION_MM, double max_radius_mm = DEFAULT_MAX_RADIUS_MM) : segmented_shape(min_segments, max_segments, resolution_mm) +segmented_arc::segmented_arc(int min_segments, int max_segments, double resolution_mm, double max_radius_mm) : segmented_shape(min_segments, max_segments, resolution_mm) { if (max_radius_mm > DEFAULT_MAX_RADIUS_MM) max_radius_mm_ = DEFAULT_MAX_RADIUS_MM; else max_radius_mm_ = max_radius_mm; diff --git a/ArcWelder/segmented_arc.h b/ArcWelder/segmented_arc.h index 04dbeea..352deab 100644 --- a/ArcWelder/segmented_arc.h +++ b/ArcWelder/segmented_arc.h @@ -35,7 +35,7 @@ class segmented_arc : { public: segmented_arc(); - segmented_arc(int min_segments, int max_segments, double resolution_mm, double max_radius); + segmented_arc(int min_segments = DEFAULT_MIN_SEGMENTS, int max_segments = DEFAULT_MAX_SEGMENTS, double resolution_mm = DEFAULT_RESOLUTION_MM, double max_radius_mm = DEFAULT_MAX_RADIUS_MM); virtual ~segmented_arc(); virtual bool try_add_point(point p, double e_relative); std::string get_shape_gcode_absolute(double e, double f); -- cgit v1.2.3