Merge pull request #318 from steinbergmedia/support-c++23-with-xcode15

Support c++23 with xcode15 (cherry picked from commit b3beb68)
steinbergmedia · Jan 11, 2024 · 01f5baa · 01f5baa
1 parent 6e803a4
commit 01f5baa
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 5 deletions.
diff --git a/vstgui/lib/cdrawcontext.cpp b/vstgui/lib/cdrawcontext.cpp
@@ -714,7 +714,7 @@ void CDrawContext::fillRadialGradient (CGraphicsPath* path, const CGradient& gra
 CGraphicsPath* CDrawContext::createGraphicsPath ()
 {
 	if (impl->device)
-		return new CGraphicsPath (impl->device->getGraphicsPathFactory ());
+		return new CGraphicsPath (impl->device->getGraphicsPathFactory (), nullptr);
 	return nullptr;
 }
 

diff --git a/vstgui/lib/cgraphicspath.h b/vstgui/lib/cgraphicspath.h
@@ -92,8 +92,7 @@ class CGraphicsPath : public AtomicReferenceCounted
 	CRect getBoundingBox ();
 	//@}
 
-	CGraphicsPath (const PlatformGraphicsPathFactoryPtr& factory,
-				   PlatformGraphicsPathPtr&& path = nullptr);
+	CGraphicsPath (const PlatformGraphicsPathFactoryPtr& factory, PlatformGraphicsPathPtr&& path);
 	~CGraphicsPath () noexcept override;
 
 	const PlatformGraphicsPathPtr& getPlatformPath (PlatformGraphicsPathFillMode fillMode);

diff --git a/vstgui/lib/cstring.h b/vstgui/lib/cstring.h
@@ -221,6 +221,9 @@ class UTF8StringView
 	bool operator== (const UTF8StringPtr otherString) const;
 	bool operator!= (const UTF8StringPtr otherString) const;
 	bool operator== (UTF8StringView otherString) const;
+	bool operator!= (UTF8StringView otherString) const;
+	bool operator== (const UTF8String& otherString) const;
+	bool operator!= (const UTF8String& otherString) const;
 	operator const UTF8StringPtr () const;
 //-----------------------------------------------------------------------------
 private:
@@ -463,6 +466,26 @@ inline bool UTF8StringView::operator== (UTF8StringView otherString) const
 	return operator==(otherString.str);
 }
 
+//------------------------------------------------------------------------
+inline bool UTF8StringView::operator!= (UTF8StringView otherString) const
+{
+	if (byteCount && otherString.byteCount && *byteCount != *otherString.byteCount)
+		return true;
+	return operator!= (otherString.str);
+}
+
+//------------------------------------------------------------------------
+inline bool UTF8StringView::operator== (const UTF8String& otherString) const
+{
+	return otherString == str;
+}
+
+//------------------------------------------------------------------------
+inline bool UTF8StringView::operator!= (const UTF8String& otherString) const
+{
+	return otherString != str;
+}
+
 //-----------------------------------------------------------------------------
 inline UTF8StringView::operator const UTF8StringPtr () const
 {

diff --git a/vstgui/lib/platform/mac/cgbitmap.cpp b/vstgui/lib/platform/mac/cgbitmap.cpp
@@ -270,7 +270,8 @@ CGImageRef CGBitmap::getCGImage ()
 		size_t rowBytes = getBytesPerRow ();
 		size_t bitDepth = 32;
 
-		CGBitmapInfo bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Big;
+		CGBitmapInfo bitmapInfo =
+			static_cast<CGBitmapInfo> (kCGImageAlphaPremultipliedFirst) | kCGBitmapByteOrder32Big;
 		image = CGImageCreate (static_cast<size_t> (size.x), static_cast<size_t> (size.y), 8, bitDepth, rowBytes, GetCGColorSpace (), bitmapInfo, bitsDataProvider, nullptr, false, kCGRenderingIntentDefault);
 		dirty = false;
 	}
@@ -300,7 +301,8 @@ CGContextRef CGBitmap::createCGContext ()
 	}
 	if (bits)
 	{
-		CGBitmapInfo bitmapInfo = kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Big;
+		CGBitmapInfo bitmapInfo =
+			static_cast<CGBitmapInfo> (kCGImageAlphaPremultipliedFirst) | kCGBitmapByteOrder32Big;
 		context = CGBitmapContextCreate (bits,
 						static_cast<size_t> (size.x),
 						static_cast<size_t> (size.y),

diff --git a/vstgui/lib/platform/mac/macfactory.h b/vstgui/lib/platform/mac/macfactory.h
@@ -16,6 +16,7 @@ class MacFactory final : public IPlatformFactory
 {
 public:
 	MacFactory (CFBundleRef bundle);
+	~MacFactory () noexcept override;
 
 	CFBundleRef getBundle () const noexcept;
 

diff --git a/vstgui/lib/platform/mac/macfactory.mm b/vstgui/lib/platform/mac/macfactory.mm
@@ -46,6 +46,8 @@
 	mach_timebase_info (&impl->timebaseInfo);
 }
 
+MacFactory::~MacFactory () noexcept = default;
+
 //-----------------------------------------------------------------------------
 CFBundleRef MacFactory::getBundle () const noexcept
 {