From 9353f9b28bc463453aa15f4372e7fb5bafb5bf22 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 10 Jun 2021 13:51:59 -0400 Subject: [PATCH] Mac: Fix Xcode 12.5 build errors related to implicit copy assignment operators --- include/internal/cef_types_wrappers.h | 45 ++++++++++----------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/include/internal/cef_types_wrappers.h b/include/internal/cef_types_wrappers.h index c9a9ba000..78ecdb5c4 100644 --- a/include/internal/cef_types_wrappers.h +++ b/include/internal/cef_types_wrappers.h @@ -151,10 +151,9 @@ class CefPoint : public CefStructBase { public: typedef CefStructBase parent; - CefPoint() : parent() {} + CefPoint() {} CefPoint(const cef_point_t& r) : parent(r) {} - CefPoint(const CefPoint& r) : parent(r) {} - CefPoint(int x, int y) : parent() { Set(x, y); } + CefPoint(int x, int y) { Set(x, y); } bool IsEmpty() const { return x <= 0 && y <= 0; } void Set(int x_val, int y_val) { x = x_val, y = y_val; } @@ -188,12 +187,9 @@ class CefRect : public CefStructBase { public: typedef CefStructBase parent; - CefRect() : parent() {} + CefRect() {} CefRect(const cef_rect_t& r) : parent(r) {} - CefRect(const CefRect& r) : parent(r) {} - CefRect(int x, int y, int width, int height) : parent() { - Set(x, y, width, height); - } + CefRect(int x, int y, int width, int height) { Set(x, y, width, height); } bool IsEmpty() const { return width <= 0 || height <= 0; } void Set(int x_val, int y_val, int width_val, int height_val) { @@ -240,10 +236,9 @@ class CefSize : public CefStructBase { public: typedef CefStructBase parent; - CefSize() : parent() {} + CefSize() {} CefSize(const cef_size_t& r) : parent(r) {} - CefSize(const CefSize& r) : parent(r) {} - CefSize(int width, int height) : parent() { Set(width, height); } + CefSize(int width, int height) { Set(width, height); } bool IsEmpty() const { return width <= 0 || height <= 0; } void Set(int width_val, int height_val) { @@ -279,10 +274,9 @@ class CefRange : public CefStructBase { public: typedef CefStructBase parent; - CefRange() : parent() {} + CefRange() {} CefRange(const cef_range_t& r) : parent(r) {} - CefRange(const CefRange& r) : parent(r) {} - CefRange(int from, int to) : parent() { Set(from, to); } + CefRange(int from, int to) { Set(from, to); } void Set(int from_val, int to_val) { from = from_val, to = to_val; } }; @@ -315,10 +309,9 @@ class CefInsets : public CefStructBase { public: typedef CefStructBase parent; - CefInsets() : parent() {} + CefInsets() {} CefInsets(const cef_insets_t& r) : parent(r) {} - CefInsets(const CefInsets& r) : parent(r) {} - CefInsets(int top, int left, int bottom, int right) : parent() { + CefInsets(int top, int left, int bottom, int right) { Set(top, left, bottom, right); } @@ -356,10 +349,9 @@ class CefDraggableRegion : public CefStructBase { public: typedef CefStructBase parent; - CefDraggableRegion() : parent() {} + CefDraggableRegion() {} CefDraggableRegion(const cef_draggable_region_t& r) : parent(r) {} - CefDraggableRegion(const CefDraggableRegion& r) : parent(r) {} - CefDraggableRegion(const CefRect& bounds, bool draggable) : parent() { + CefDraggableRegion(const CefRect& bounds, bool draggable) { Set(bounds, draggable); } @@ -405,16 +397,14 @@ class CefScreenInfo : public CefStructBase { public: typedef CefStructBase parent; - CefScreenInfo() : parent() {} + CefScreenInfo() {} CefScreenInfo(const cef_screen_info_t& r) : parent(r) {} - CefScreenInfo(const CefScreenInfo& r) : parent(r) {} CefScreenInfo(float device_scale_factor, int depth, int depth_per_component, bool is_monochrome, const CefRect& rect, - const CefRect& available_rect) - : parent() { + const CefRect& available_rect) { Set(device_scale_factor, depth, depth_per_component, is_monochrome, rect, available_rect); } @@ -806,11 +796,10 @@ class CefTime : public CefStructBase { public: typedef CefStructBase parent; - CefTime() : parent() {} + CefTime() {} CefTime(const cef_time_t& r) : parent(r) {} - CefTime(const CefTime& r) : parent(r) {} - explicit CefTime(time_t r) : parent() { SetTimeT(r); } - explicit CefTime(double r) : parent() { SetDoubleT(r); } + explicit CefTime(time_t r) { SetTimeT(r); } + explicit CefTime(double r) { SetDoubleT(r); } // Converts to/from time_t. void SetTimeT(time_t r) { cef_time_from_timet(r, this); }