Skip to content

closes https://github.com/kimkulling/cppcore/issues/5: fix invalid st… #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kimkulling merged 1 commit into from
Jan 18, 2020
Merged

closes https://github.com/kimkulling/cppcore/issues/5: fix invalid st… #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ if( WIN32 AND NOT CYGWIN )
endif()
elseif( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
# Update if necessary
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++0x")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -g -pedantic -std=c++0x")
elseif ( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -g -pedantic -std=c++11")
endif()

IF (ASSIMP_ASAN)
Expand Down
5 changes: 3 additions & 2 deletions include/cppcore/Container/TArray.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@ void TArray<T>::move( size_t fromIdx, size_t toIdx ) {

size_t numElements = m_Size - fromIdx;
size_t newSize = toIdx + numElements;
printf("newSize = %d\n", newSize);
while ( m_Capacity < newSize ) {
resize( m_Capacity + getGrowing( newSize - m_Capacity ) );
}
Expand All @@ -348,8 +349,8 @@ void TArray<T>::move( size_t fromIdx, size_t toIdx ) {
destroy( index );
}
} else {
for ( size_t i=numElements-1; i>=0; --i ) {
m_pData[ toIdx + i ] = m_pData[ fromIdx + i ];
for ( size_t i=numElements-1; i!=0; --i ) {
m_pData[ toIdx + i ] = m_pData[ fromIdx + i ];
}

for( size_t i = 0; i<numElements; i++ ) {
Expand Down