Skip to content

Commit 143c6fc

Browse files
committed
Merge branch 'master' of https://github.com/kimkulling/cppcore
2 parents 8e5ffb5 + 96974f0 commit 143c6fc

File tree

336 files changed

+1691
-50311
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+1691
-50311
lines changed

.travis.sh

-32
This file was deleted.

.travis.yml

-34
This file was deleted.

CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ add_definitions( -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING=1)
3030

3131
INCLUDE_DIRECTORIES( BEFORE
3232
include/
33-
contrib/googletest-1.10.0/gtest/include
34-
contrib/googletest-1.10.0/gtest
33+
contrib/googletest-1.15.2/googletest/include
34+
contrib/googletest-1.15.2/googletest
3535
)
3636

3737
link_directories(
@@ -157,7 +157,7 @@ IF( CPPCORE_BUILD_UNITTESTS )
157157
test/Random/RandomGeneratorTest.cpp
158158
)
159159

160-
SET ( GTEST_PATH ../contrib/googletest-1.10.0 )
160+
SET ( GTEST_PATH ../contrib/googletest-1.15.2 )
161161

162162
SOURCE_GROUP( code FILES ${cppcore_test_src} )
163163
SOURCE_GROUP( code\\common FILES ${cppcore_common_test_src} )
@@ -168,7 +168,7 @@ IF( CPPCORE_BUILD_UNITTESTS )
168168
# Prevent overriding the parent project's compiler/linker
169169
# settings on Windows
170170
SET(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
171-
ADD_SUBDIRECTORY( contrib/googletest-1.10.x/ )
171+
ADD_SUBDIRECTORY( contrib/googletest-1.15.2/ )
172172
ADD_EXECUTABLE( cppcore_unittest
173173
${cppcore_test_src}
174174
${cppcore_common_test_src}

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ tests, so doing a proof of my failures are easy :-).
99

1010
# Build status
1111
[![Build status](https://github.com/kimkulling/cppcore/actions/workflows/cmake.yml/badge.svg)](https://github.com/kimkulling/cppcore/actions/workflows/cmake.yml)
12+
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=kimkulling_cppcore&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=kimkulling_cppcore)
1213

1314
## Used in...
1415
* OSRE (aka Open-Source-Render-Experience): [The OSRE Repo](https://github.com/kimkulling/osre)

code/Memory/MemUtils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*-----------------------------------------------------------------------------------------------
22
The MIT License (MIT)
33
4-
Copyright (c) 2014-2024 Kim Kulling
4+
Copyright (c) 2014-2025 Kim Kulling
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy of
77
this software and associated documentation files (the "Software"), to deal in

code/Random/RandomGenerator.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ RandomGenerator::RandomGenerator( GeneratorType type ) noexcept :
8383
::srand( static_cast<unsigned int>(time(nullptr)));
8484
}
8585

86-
RandomGenerator::~RandomGenerator() {
87-
// empty
88-
}
89-
9086
int RandomGenerator::get( int lower, int upper ) {
9187
int ret( 0 );
9288
if ( GeneratorType::Standard == m_type ) {

contrib/googletest-1.10.x/.travis.yml

-73
This file was deleted.

contrib/googletest-1.10.x/WORKSPACE

-27
This file was deleted.

contrib/googletest-1.10.x/appveyor.yml

-154
This file was deleted.

0 commit comments

Comments
 (0)