schiff

commit 9b1c58323b26e9646f8dc9676b7aba1ad0c06b5a
parent 205b2a98160f5dc651b8417dec6cb475ae237535
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 20 Oct 2021 09:29:22 +0200

Merge branch 'release_0.4.2'

Diffstat:
M
README.md
 | 
17
++++++++++++-----
M
cmake/CMakeLists.txt
 | 
8
++++----
M
src/schiff.c
 | 
2
+-

3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/README.md b/README.md
@@ -33,6 +33,11 @@ formats on which it relies.
 
 ## Release notes
 
+### Version 0.4.2
+
+Sets the required version of Star-SampPling to 0.12. This version fixes
+compilation errors with gcc 11 but introduces API breaks.
+
 ### Version 0.4.1
 
 Displays the time spent constructing the geometric distribution, writing the
@@ -54,8 +59,10 @@ sampled geometries, and performing the calculations.
 
 ## License
 
-Copyright (C) 2020, 2021 [|Meso|Star>](http://www.meso-star.com)
-(contact@meso-star.com).  Copyright (C) 2015, 2016 CNRS. Schiff is free
-software released under the GPL v3+ license: GNU GPL version 3 or later. You
-are welcome to redistribute it under certain conditions; refer to the COPYING
-file for details.
+Copyright (C) 2020, 2021 [|Meso|Star>](http://www.meso-star.com)  
+(<contact@meso-star.com>).  
+Copyright (C) 2015, 2016 CNRS.
+
+Schiff is free software released under the GPL v3+ license: GNU GPL version 3
+or later. You are welcome to redistribute it under certain conditions; refer to
+the COPYING file for details.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -29,9 +29,9 @@ set(LibYAML_DIR ${_current_source_dir}/)
 find_package(LibYAML REQUIRED)
 find_package(RCMake 0.4 REQUIRED)
 find_package(RSys 0.8 REQUIRED)
-find_package(Star3D 0.6 REQUIRED)
-find_package(StarSchiff 0.4 REQUIRED)
-find_package(StarSP 0.8 REQUIRED)
+find_package(Star3D 0.8 REQUIRED)
+find_package(StarSchiff 0.4.1 REQUIRED)
+find_package(StarSP 0.12 REQUIRED)
 
 include_directories(
   ${LibYAML_INCLUDE_DIR}
@@ -50,7 +50,7 @@ include(rcmake_runtime)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SCHIFF_ARGS_DEFAULT_NINSAMPLES "100")
diff --git a/src/schiff.c b/src/schiff.c
@@ -392,7 +392,7 @@ run(const struct schiff_args* args)
     }
   }
 
-  res = ssp_rng_create(&mem_default_allocator, &ssp_rng_threefry, &rng);
+  res = ssp_rng_create(&mem_default_allocator, SSP_RNG_THREEFRY, &rng);
   if(res != RES_OK) {
     fprintf(stderr, "Couldn't create the Random Number Generator.\n");
     goto error;