Merge pull request #3235 from AiraYumi/poc_cpp23

Adding C++23 compatibility in a dev branch to test internal builds as well.

Author: nat-goodspeed

.github/workflows/build.yaml

@@ -72,7 +72,7 @@ jobs:
       # autobuild-package.xml.
       AUTOBUILD_VCS_INFO: "true"
       AUTOBUILD_VSVER: "170"
-      DEVELOPER_DIR: "/Applications/Xcode_16.0.app/Contents/Developer"
+      DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer"
       # Ensure that Linden viewer builds engage Bugsplat.
       BUGSPLAT_DB: ${{ needs.setup.outputs.bugsplat_db }}
       build_coverity: false

indra/CMakeLists.txt

@@ -29,7 +29,7 @@ else()
   set( USE_AUTOBUILD_3P ON )
 endif()
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 include(Variables)

indra/newview/llpanelface.cpp

@@ -1838,6 +1838,7 @@ class PBRPickerAgentListener : public LLInventoryObserver
         mChangePending = false;
     }
 };
+void std::default_delete<PBRPickerAgentListener>::operator()(PBRPickerAgentListener * ptr) const noexcept { delete ptr; }
 
 // One-off listener that updates the build floater UI when the prim inventory updates
 class PBRPickerObjectListener : public LLVOInventoryListener
@@ -1877,6 +1878,7 @@ class PBRPickerObjectListener : public LLVOInventoryListener
         mChangePending = false;
     }
 };
+void std::default_delete<PBRPickerObjectListener>::operator()(PBRPickerObjectListener * ptr) const noexcept { delete ptr; }
 
 void LLPanelFace::updateUIGLTF(LLViewerObject* objectp, bool& has_pbr_material, bool& has_faces_without_pbr, bool force_set_values)
 {

indra/newview/llpanelface.h

@@ -57,6 +57,18 @@ class LLRadioGroup;
 class PBRPickerAgentListener;
 class PBRPickerObjectListener;
 
+// This is specializations are needed to support std::unique_ptr<T> where T is an incomplete type
+namespace std {
+    template<> struct default_delete<PBRPickerAgentListener> {
+        constexpr default_delete() noexcept = default;
+        void operator()(PBRPickerAgentListener* ptr) const noexcept;
+    };
+    template<> struct default_delete<PBRPickerObjectListener> {
+        constexpr default_delete() noexcept = default;
+        void operator()(PBRPickerObjectListener* ptr) const noexcept;
+    };
+}
+
 // Represents an edit for use in replicating the op across one or more materials in the selection set.
 //
 // The apply function optionally performs the edit which it implements

indra/newview/llterrainpaintmap.cpp

@@ -815,13 +815,13 @@ LLTerrainPaintQueue LLTerrainPaintMap::convertBrushQueueToPaintRGB(const LLViewe
 }
 
 template<typename T>
-LLTerrainQueue<T>::LLTerrainQueue(LLTerrainQueue<T>& other)
+LLTerrainQueue<T>::LLTerrainQueue(const LLTerrainQueue<T>& other)
 {
     *this = other;
 }
 
 template<typename T>
-LLTerrainQueue<T>& LLTerrainQueue<T>::operator=(LLTerrainQueue<T>& other)
+LLTerrainQueue<T>& LLTerrainQueue<T>::operator=(const LLTerrainQueue<T>& other)
 {
     mList = other.mList;
     return *this;
@@ -890,14 +890,14 @@ LLTerrainPaintQueue::LLTerrainPaintQueue(U8 components)
     llassert(mComponents == LLTerrainPaint::RGB || mComponents == LLTerrainPaint::RGBA);
 }
 
-LLTerrainPaintQueue::LLTerrainPaintQueue(LLTerrainPaintQueue& other)
+LLTerrainPaintQueue::LLTerrainPaintQueue(const LLTerrainPaintQueue& other)
 : LLTerrainQueue<LLTerrainPaint>(other)
 , mComponents(other.mComponents)
 {
     llassert(mComponents == LLTerrainPaint::RGB || mComponents == LLTerrainPaint::RGBA);
 }
 
-LLTerrainPaintQueue& LLTerrainPaintQueue::operator=(LLTerrainPaintQueue& other)
+LLTerrainPaintQueue& LLTerrainPaintQueue::operator=(const LLTerrainPaintQueue& other)
 {
     LLTerrainQueue<LLTerrainPaint>::operator=(other);
     mComponents = other.mComponents;

indra/newview/llterrainpaintmap.h

@@ -65,8 +65,8 @@ class LLTerrainQueue
 {
 public:
     LLTerrainQueue() = default;
-    LLTerrainQueue(LLTerrainQueue<T>& other);
-    LLTerrainQueue& operator=(LLTerrainQueue<T>& other);
+    LLTerrainQueue(const LLTerrainQueue<T>& other);
+    LLTerrainQueue& operator=(const LLTerrainQueue<T>& other);
 
     bool enqueue(std::shared_ptr<T>& t, bool dry_run = false);
     size_t size() const;
@@ -113,8 +113,8 @@ class LLTerrainPaintQueue : public LLTerrainQueue<LLTerrainPaint>
     LLTerrainPaintQueue() = delete;
     // components determines what type of LLTerrainPaint is allowed. Must be 3 (RGB) or 4 (RGBA)
     LLTerrainPaintQueue(U8 components);
-    LLTerrainPaintQueue(LLTerrainPaintQueue& other);
-    LLTerrainPaintQueue& operator=(LLTerrainPaintQueue& other);
+    LLTerrainPaintQueue(const LLTerrainPaintQueue& other);
+    LLTerrainPaintQueue& operator=(const LLTerrainPaintQueue& other);
 
     bool enqueue(LLTerrainPaint::ptr_t& paint, bool dry_run = false);
     bool enqueue(LLTerrainPaintQueue& queue);