Ubuntu 24.04 warnings.

rerdavies · Nov 11, 2024 · d6bd5f3 · d6bd5f3
1 parent d612a53
commit d6bd5f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/src/lv2c/Lv2cTableElement.cpp b/src/lv2c/Lv2cTableElement.cpp
@@ -70,7 +70,7 @@ size_t Lv2cTableElement::RowCount() const
     return ChildCount() / ColumnCount();
 }
 
-Lv2cElement::ptr &Lv2cTableElement::Child(size_t row, size_t column)
+Lv2cElement::ptr &Lv2cTableElement::ChildCell(size_t row, size_t column)
 {
     return Children()[row * ColumnCount() + column];
 }
@@ -118,7 +118,7 @@ Lv2cSize Lv2cTableElement::MeasureClient(
                 Lv2cSize childConstraint(columnDefinition.columnWidth- cellExtra.Width(), 0);
                 for (size_t r = 0; r < rowCount; ++r)
                 {
-                    auto &child = Child(r, c);
+                    auto &child = ChildCell(r, c);
                     child->Measure(childConstraint, childAvailable, context);
                     Lv2cSize size = child->MeasuredSize();
                     size = size + cellExtra;
@@ -138,7 +138,7 @@ Lv2cSize Lv2cTableElement::MeasureClient(
 
                 for (size_t r = 0; r < rowCount; ++r)
                 {
-                    auto &child = Child(r, c);
+                    auto &child = ChildCell(r, c);
                     child->Measure(childConstraint, childAvailable, context);
                     auto size = child->MeasuredSize();
                     size = size + cellExtra;
@@ -193,7 +193,7 @@ Lv2cSize Lv2cTableElement::MeasureClient(
                 Lv2cSize childAvailable(childWidth,clientAvailable.Height());
                 for (size_t r = 0; r < rowCount; ++r)
                 {
-                    auto &child = Child(r, c);
+                    auto &child = ChildCell(r, c);
 
                     child->Measure(childConstraint, childAvailable, context);
                     auto measureSize = child->MeasuredSize();
@@ -244,7 +244,7 @@ Lv2cSize Lv2cTableElement::Arrange(Lv2cSize available, Lv2cDrawingContext &conte
         double x = 0;
         for (size_t c = 0; c < columnCount; ++c)
         {
-            auto &child = Child(r, c);
+            auto &child = ChildCell(r, c);
             Lv2cSize measuredSize = child->MeasuredSize();
             auto &columnDefinition = columnDefinitions[c];
 

diff --git a/src/lv2c/include/lv2c/Lv2cContainerElement.hpp b/src/lv2c/include/lv2c/Lv2cContainerElement.hpp
@@ -22,7 +22,6 @@
 #pragma once
 
 
-#pragma GCC diagnostic ignored "-Woverloaded-virtual" // GCC 13 warning.
 
 namespace lv2c {
     class Lv2cContainerElement: public Lv2cElement {

diff --git a/src/lv2c/include/lv2c/Lv2cTableElement.hpp b/src/lv2c/include/lv2c/Lv2cTableElement.hpp
@@ -37,14 +37,9 @@ namespace lv2c {
 
         static ptr Create() { return std::make_shared<self>(); }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Woverloaded-virtual" //GCC 12
-#pragma GCC diagnostic ignored "-Woverloaded-virtual=" // GCC 13
 
-        Lv2cElement::ptr&Child(size_t row, size_t column);
+        Lv2cElement::ptr&ChildCell(size_t row, size_t column);
 
-
-#pragma GCC diagnostic pop
     public:
         size_t ColumnCount() const;
         Lv2cTableElement &ColumnCount(size_t columns);