Merge pull request #1196 from vsg-dev/gcc_13_warning_fixes

robertosfield · web-flow · commit 967e6327790c · 2024-05-20T10:10:12.000+01:00
Renamed ArrayState::clone() to ArrayState::cloneArrayState() to fix gcc 13 warnings.
diff --git a/include/vsg/state/ArrayState.h b/include/vsg/state/ArrayState.h
@@ -31,13 +31,13 @@ namespace vsg
         ArrayState(const ArrayState& rhs, const CopyOp& copyop = {});
 
         /// clone self
-        virtual ref_ptr<ArrayState> clone()
+        virtual ref_ptr<ArrayState> cloneArrayState()
         {
             return ArrayState::create(*this);
         }
 
         // clone the specified ArrayState
-        virtual ref_ptr<ArrayState> clone(ref_ptr<ArrayState> arrayState)
+        virtual ref_ptr<ArrayState> cloneArrayState(ref_ptr<ArrayState> arrayState)
         {
             return ArrayState::create(*arrayState);
         }
@@ -99,8 +99,8 @@ namespace vsg
         NullArrayState();
         explicit NullArrayState(const ArrayState& as);
 
-        ref_ptr<ArrayState> clone() override;
-        ref_ptr<ArrayState> clone(ref_ptr<ArrayState> arrayState) override;
+        ref_ptr<ArrayState> cloneArrayState() override;
+        ref_ptr<ArrayState> cloneArrayState(ref_ptr<ArrayState> arrayState) override;
 
         using ArrayState::apply;
 
@@ -117,8 +117,8 @@ namespace vsg
         PositionArrayState(const PositionArrayState& rhs);
         explicit PositionArrayState(const ArrayState& rhs);
 
-        ref_ptr<ArrayState> clone() override;
-        ref_ptr<ArrayState> clone(ref_ptr<ArrayState> arrayState) override;
+        ref_ptr<ArrayState> cloneArrayState() override;
+        ref_ptr<ArrayState> cloneArrayState(ref_ptr<ArrayState> arrayState) override;
 
         uint32_t position_attribute_location = 4;
         AttributeDetails positionAttribute;
@@ -138,8 +138,8 @@ namespace vsg
         DisplacementMapArrayState(const DisplacementMapArrayState& rhs);
         explicit DisplacementMapArrayState(const ArrayState& rhs);
 
-        ref_ptr<ArrayState> clone() override;
-        ref_ptr<ArrayState> clone(ref_ptr<ArrayState> arrayState) override;
+        ref_ptr<ArrayState> cloneArrayState() override;
+        ref_ptr<ArrayState> cloneArrayState(ref_ptr<ArrayState> arrayState) override;
 
         // binding of displacement map
         uint32_t normal_attribute_location = 1;
@@ -175,8 +175,8 @@ namespace vsg
         uint32_t position_attribute_location = 4;
         AttributeDetails positionAttribute;
 
-        ref_ptr<ArrayState> clone() override;
-        ref_ptr<ArrayState> clone(ref_ptr<ArrayState> arrayState) override;
+        ref_ptr<ArrayState> cloneArrayState() override;
+        ref_ptr<ArrayState> cloneArrayState(ref_ptr<ArrayState> arrayState) override;
 
         void apply(const VertexInputState& vas) override;
         ref_ptr<const vec3Array> vertexArray(uint32_t instanceIndex) override;
@@ -191,8 +191,8 @@ namespace vsg
         BillboardArrayState(const BillboardArrayState& rhs);
         explicit BillboardArrayState(const ArrayState& rhs);
 
-        ref_ptr<ArrayState> clone() override;
-        ref_ptr<ArrayState> clone(ref_ptr<ArrayState> arrayState) override;
+        ref_ptr<ArrayState> cloneArrayState() override;
+        ref_ptr<ArrayState> cloneArrayState(ref_ptr<ArrayState> arrayState) override;
 
         uint32_t position_attribute_location = 4;
         AttributeDetails positionAttribute;
diff --git a/src/vsg/state/ArrayState.cpp b/src/vsg/state/ArrayState.cpp
@@ -179,13 +179,13 @@ NullArrayState::NullArrayState(const ArrayState& as) :
     vertices = {};
 }
 
-ref_ptr<ArrayState> NullArrayState::clone()
+ref_ptr<ArrayState> NullArrayState::cloneArrayState()
 {
     return NullArrayState::create(*this);
 }
 
 // clone the specified ArrayState
-ref_ptr<ArrayState> NullArrayState::clone(ref_ptr<ArrayState> arrayState)
+ref_ptr<ArrayState> NullArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)
 {
     return NullArrayState::create(*arrayState);
 }
@@ -220,12 +220,12 @@ PositionArrayState::PositionArrayState(const ArrayState& rhs) :
 {
 }
 
-ref_ptr<ArrayState> PositionArrayState::clone()
+ref_ptr<ArrayState> PositionArrayState::cloneArrayState()
 {
     return PositionArrayState::create(*this);
 }
 
-ref_ptr<ArrayState> PositionArrayState::clone(ref_ptr<ArrayState> arrayState)
+ref_ptr<ArrayState> PositionArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)
 {
     return PositionArrayState::create(*arrayState);
 }
@@ -273,12 +273,12 @@ DisplacementMapArrayState::DisplacementMapArrayState(const ArrayState& rhs) :
 {
 }
 
-ref_ptr<ArrayState> DisplacementMapArrayState::clone()
+ref_ptr<ArrayState> DisplacementMapArrayState::cloneArrayState()
 {
     return DisplacementMapArrayState::create(*this);
 }
 
-ref_ptr<ArrayState> DisplacementMapArrayState::clone(ref_ptr<ArrayState> arrayState)
+ref_ptr<ArrayState> DisplacementMapArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)
 {
     return DisplacementMapArrayState::create(*arrayState);
 }
@@ -380,12 +380,12 @@ PositionAndDisplacementMapArrayState::PositionAndDisplacementMapArrayState(const
 {
 }
 
-ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::clone()
+ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::cloneArrayState()
 {
     return PositionAndDisplacementMapArrayState::create(*this);
 }
 
-ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::clone(ref_ptr<ArrayState> arrayState)
+ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)
 {
     return PositionAndDisplacementMapArrayState::create(*arrayState);
 }
@@ -457,12 +457,12 @@ BillboardArrayState::BillboardArrayState(const ArrayState& rhs) :
 {
 }
 
-ref_ptr<ArrayState> BillboardArrayState::clone()
+ref_ptr<ArrayState> BillboardArrayState::cloneArrayState()
 {
     return BillboardArrayState::create(*this);
 }
 
-ref_ptr<ArrayState> BillboardArrayState::clone(ref_ptr<ArrayState> arrayState)
+ref_ptr<ArrayState> BillboardArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)
 {
     return BillboardArrayState::create(*arrayState);
 }
diff --git a/src/vsg/utils/ComputeBounds.cpp b/src/vsg/utils/ComputeBounds.cpp
@@ -45,7 +45,7 @@ void ComputeBounds::apply(const vsg::Object& object)
 
 void ComputeBounds::apply(const StateGroup& stategroup)
 {
-    auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->clone(arrayStateStack.back()) : arrayStateStack.back()->clone();
+    auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->cloneArrayState(arrayStateStack.back()) : arrayStateStack.back()->cloneArrayState();
 
     for (auto& statecommand : stategroup.stateCommands)
     {
diff --git a/src/vsg/utils/Intersector.cpp b/src/vsg/utils/Intersector.cpp
@@ -57,7 +57,7 @@ void Intersector::apply(const StateGroup& stategroup)
 {
     PushPopNode ppn(_nodePath, &stategroup);
 
-    auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->clone(arrayStateStack.back()) : arrayStateStack.back()->clone();
+    auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->cloneArrayState(arrayStateStack.back()) : arrayStateStack.back()->cloneArrayState();
 
     for (auto& statecommand : stategroup.stateCommands)
     {

Original file line number	Diff line number	Diff line change
`@@ -179,13 +179,13 @@ NullArrayState::NullArrayState(const ArrayState& as) :`
`179`	`179`	`vertices = {};`
`180`	`180`	`}`
`181`	`181`
`182`		`-ref_ptr<ArrayState> NullArrayState::clone()`
	`182`	`+ref_ptr<ArrayState> NullArrayState::cloneArrayState()`
`183`	`183`	`{`
`184`	`184`	`return NullArrayState::create(*this);`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`// clone the specified ArrayState`
`188`		`-ref_ptr<ArrayState> NullArrayState::clone(ref_ptr<ArrayState> arrayState)`
	`188`	`+ref_ptr<ArrayState> NullArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)`
`189`	`189`	`{`
`190`	`190`	`return NullArrayState::create(*arrayState);`
`191`	`191`	`}`
`@@ -220,12 +220,12 @@ PositionArrayState::PositionArrayState(const ArrayState& rhs) :`
`220`	`220`	`{`
`221`	`221`	`}`
`222`	`222`
`223`		`-ref_ptr<ArrayState> PositionArrayState::clone()`
	`223`	`+ref_ptr<ArrayState> PositionArrayState::cloneArrayState()`
`224`	`224`	`{`
`225`	`225`	`return PositionArrayState::create(*this);`
`226`	`226`	`}`
`227`	`227`
`228`		`-ref_ptr<ArrayState> PositionArrayState::clone(ref_ptr<ArrayState> arrayState)`
	`228`	`+ref_ptr<ArrayState> PositionArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)`
`229`	`229`	`{`
`230`	`230`	`return PositionArrayState::create(*arrayState);`
`231`	`231`	`}`
`@@ -273,12 +273,12 @@ DisplacementMapArrayState::DisplacementMapArrayState(const ArrayState& rhs) :`
`273`	`273`	`{`
`274`	`274`	`}`
`275`	`275`
`276`		`-ref_ptr<ArrayState> DisplacementMapArrayState::clone()`
	`276`	`+ref_ptr<ArrayState> DisplacementMapArrayState::cloneArrayState()`
`277`	`277`	`{`
`278`	`278`	`return DisplacementMapArrayState::create(*this);`
`279`	`279`	`}`
`280`	`280`
`281`		`-ref_ptr<ArrayState> DisplacementMapArrayState::clone(ref_ptr<ArrayState> arrayState)`
	`281`	`+ref_ptr<ArrayState> DisplacementMapArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)`
`282`	`282`	`{`
`283`	`283`	`return DisplacementMapArrayState::create(*arrayState);`
`284`	`284`	`}`
`@@ -380,12 +380,12 @@ PositionAndDisplacementMapArrayState::PositionAndDisplacementMapArrayState(const`
`380`	`380`	`{`
`381`	`381`	`}`
`382`	`382`
`383`		`-ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::clone()`
	`383`	`+ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::cloneArrayState()`
`384`	`384`	`{`
`385`	`385`	`return PositionAndDisplacementMapArrayState::create(*this);`
`386`	`386`	`}`
`387`	`387`
`388`		`-ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::clone(ref_ptr<ArrayState> arrayState)`
	`388`	`+ref_ptr<ArrayState> PositionAndDisplacementMapArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)`
`389`	`389`	`{`
`390`	`390`	`return PositionAndDisplacementMapArrayState::create(*arrayState);`
`391`	`391`	`}`
`@@ -457,12 +457,12 @@ BillboardArrayState::BillboardArrayState(const ArrayState& rhs) :`
`457`	`457`	`{`
`458`	`458`	`}`
`459`	`459`
`460`		`-ref_ptr<ArrayState> BillboardArrayState::clone()`
	`460`	`+ref_ptr<ArrayState> BillboardArrayState::cloneArrayState()`
`461`	`461`	`{`
`462`	`462`	`return BillboardArrayState::create(*this);`
`463`	`463`	`}`
`464`	`464`
`465`		`-ref_ptr<ArrayState> BillboardArrayState::clone(ref_ptr<ArrayState> arrayState)`
	`465`	`+ref_ptr<ArrayState> BillboardArrayState::cloneArrayState(ref_ptr<ArrayState> arrayState)`
`466`	`466`	`{`
`467`	`467`	`return BillboardArrayState::create(*arrayState);`
`468`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void ComputeBounds::apply(const vsg::Object& object)`
`45`	`45`
`46`	`46`	`void ComputeBounds::apply(const StateGroup& stategroup)`
`47`	`47`	`{`
`48`		`- auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->clone(arrayStateStack.back()) : arrayStateStack.back()->clone();`
	`48`	`+ auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->cloneArrayState(arrayStateStack.back()) : arrayStateStack.back()->cloneArrayState();`
`49`	`49`
`50`	`50`	`for (auto& statecommand : stategroup.stateCommands)`
`51`	`51`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ void Intersector::apply(const StateGroup& stategroup)`
`57`	`57`	`{`
`58`	`58`	`PushPopNode ppn(_nodePath, &stategroup);`
`59`	`59`
`60`		`- auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->clone(arrayStateStack.back()) : arrayStateStack.back()->clone();`
	`60`	`+ auto arrayState = stategroup.prototypeArrayState ? stategroup.prototypeArrayState->cloneArrayState(arrayStateStack.back()) : arrayStateStack.back()->cloneArrayState();`
`61`	`61`
`62`	`62`	`for (auto& statecommand : stategroup.stateCommands)`
`63`	`63`	`{`