From 3c5730052d8e700347c2776c433d606c6e7e45ad Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 23 Jan 2019 13:30:34 +0100 Subject: [PATCH 1/2] [cpp] Use -Wnonportable-include-path for CMake. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b7f35cf..2ca88a876 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,8 @@ if(MSVC) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") else() - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -Wshadow -std=c89") - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wnon-virtual-dtor -pedantic -Wshadow -std=c++03 -fno-exceptions -fno-rtti") + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -Wnonportable-include-path -Wshadow -std=c89") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wnon-virtual-dtor -pedantic -Wnonportable-include-path -Wshadow -std=c++03 -fno-exceptions -fno-rtti") endif() set(CMAKE_INSTALL_PREFIX "./") From 0919c1b9d210f8db1f7d4834e78531e711256ae0 Mon Sep 17 00:00:00 2001 From: badlogic Date: Wed, 23 Jan 2019 13:39:14 +0100 Subject: [PATCH 2/2] [cpp] Closes #1243, make cleanUpVectorOfPointers() linear in time complexity. --- spine-cpp/spine-cpp/include/spine/ContainerUtil.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-cpp/spine-cpp/include/spine/ContainerUtil.h b/spine-cpp/spine-cpp/include/spine/ContainerUtil.h index e16d800bd..28e4ade1b 100644 --- a/spine-cpp/spine-cpp/include/spine/ContainerUtil.h +++ b/spine-cpp/spine-cpp/include/spine/ContainerUtil.h @@ -108,7 +108,7 @@ namespace spine { template static void cleanUpVectorOfPointers(Vector& items) { - for (size_t i = 0; i < items.size(); ) { + for (int i = (int)items.size() - 1; i >= 0; i--) { T* item = items[i]; delete item;