Merge pull request #24 from vsg-dev/gcc_13_warning_fixes

Updated to work with changes to ArrayState in VSG-1.1.4
vsg-dev · May 20, 2024 · 15446aa · 15446aa
2 parents a94b315 + 4d19a6a
commit 15446aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12)
 
 project(vsgPoints
-    VERSION 0.3.0
+    VERSION 0.4.0
     DESCRIPTION "VulkanSceneGraph Point Cloud rendering."
     LANGUAGES CXX
 )
@@ -19,7 +19,7 @@ if (VULKAN_SDK)
     set(ENV{VULKAN_SDK} ${VULKAN_SDK})
 endif()
 
-find_package(vsg 1.1.0 REQUIRED)
+find_package(vsg 1.1.4 REQUIRED)
 find_package(vsgXchange 1.0.5 REQUIRED)
 
 vsg_setup_build_vars()

diff --git a/applications/vsgpoints_example/ConvertMeshToPoints.cpp b/applications/vsgpoints_example/ConvertMeshToPoints.cpp
@@ -77,7 +77,7 @@ void ConvertMeshToPoints::apply(const vsg::Node& node)
 
 void ConvertMeshToPoints::apply(const vsg::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)
     {