Skip to content

Commit ad2adf4

Browse files
committed
Merge branch 'fix/compiler-warnings' into 'develop'
fixing compiler warnings See merge request njoy/ENDFtk!54
2 parents d38d4f9 + 248882d commit ad2adf4

47 files changed

Lines changed: 227 additions & 184 deletions

Some content is hidden

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

cmake/dependencies.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ include( shacl_FetchContent )
44

55
shacl_FetchContent_Declare( tools
66
GIT_REPOSITORY ../../njoy/tools
7-
GIT_TAG b03f7f65070d84009c1ba5ae2e095f2e8a1a6ed4 # tag: v0.4.4
7+
GIT_TAG 3febd4d75a85fe9c793fb6693ddab2efb76e2df7 # NOT A RELEASED VERSION - CHANGE ME!
88
)
99

1010
#######################################################################

python/src/file/1.python.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ void wrapFile_1( python::module& module, python::module& viewmodule ) {
3030
using MF1MT456 = njoy::ENDFtk::section::Type< 1, 456 >;
3131
using MF1MT458 = njoy::ENDFtk::section::Type< 1, 458 >;
3232
using MF1MT460 = njoy::ENDFtk::section::Type< 1, 460 >;
33-
using GMF1MT451 = njoy::ENDFtk::section::GType< 1, 451 >;
3433
using File = njoy::ENDFtk::file::Type< 1 >;
3534
using Section = std::variant< MF1MT451, MF1MT452, MF1MT455,
3635
MF1MT456, MF1MT458, MF1MT460 >;

python/src/file/5.python.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ void wrapFile_5( python::module& module, python::module& viewmodule ) {
2121
using Section = njoy::ENDFtk::section::Type< 5 >;
2222
using File = njoy::ENDFtk::file::Type< 5 >;
2323
using SectionRange = BidirectionalAnyView< Section >;
24-
using GMF5MT455 = njoy::ENDFtk::section::GType< 5, 455 >;
25-
using GMF5MT18 = njoy::ENDFtk::section::GType< 5, 18 >;
2624

2725
// create the submodule
2826
python::module submodule = module.def_submodule(
@@ -33,7 +31,7 @@ void wrapFile_5( python::module& module, python::module& viewmodule ) {
3331

3432
// wrap sections
3533
wrapSection_5( submodule, viewmodule );
36-
34+
3735
// wrap multigroup sections
3836
wrapGSection_5_455( submodule, viewmodule );
3937
wrapGSection_5_18( submodule, viewmodule );

python/src/gsection/1g.python.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@
1111
// namespace aliases
1212
namespace python = pybind11;
1313

14-
void wrapGSection_1_451( python::module& module, python::module& viewmodule ) {
14+
void wrapGSection_1_451( python::module& module, python::module& ) {
1515

1616
// type aliases
17-
using DirectoryRecord = njoy::ENDFtk::DirectoryRecord;
1817
using GSection = njoy::ENDFtk::section::GType< 1, 451 >;
19-
using DirectoryRange = RandomAccessAnyView< DirectoryRecord >;
2018

2119
// create submodule
2220
python::module submodule = module.def_submodule(

python/src/gsection/5/18g.python.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// namespace aliases
1010
namespace python = pybind11;
1111

12-
void wrapGSection_5_18( python::module& module, python::module& viewmodule ) {
12+
void wrapGSection_5_18( python::module& module, python::module& ) {
1313

1414
// type alias
1515
using GSection = njoy::ENDFtk::section::GType< 5, 18 >;

python/src/gsection/5/455g.python.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// namespace aliases
1010
namespace python = pybind11;
1111

12-
void wrapGSection_5_455( python::module& module, python::module& viewmodule ) {
12+
void wrapGSection_5_455( python::module& module, python::module& ) {
1313

1414
// type alias
1515
using GSection = njoy::ENDFtk::section::GType< 5, 455 >;

python/src/section/14.python.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ void wrapSection_14( python::module& module, python::module& viewmodule ) {
3535
using Section = njoy::ENDFtk::section::Type< 14 >;
3636
using PhotonDistribution = Section::PhotonDistribution;
3737
using AnisotropicPhotonDistribution = Section::AnisotropicPhotonDistribution;
38-
using PhotonDistributionRange = RandomAccessAnyView< PhotonDistribution >;
3938

4039
// wrap views created by this section
4140
// none of these are supposed to be created directly by the user

python/src/section/31.python.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// namespace aliases
1010
namespace python = pybind11;
1111

12-
void wrapSection_31( python::module& module, python::module& viewmodule ) {
12+
void wrapSection_31( python::module& module, python::module& ) {
1313

1414
// type aliases
1515
using Section = njoy::ENDFtk::section::Type< 31 >;

python/src/section/32/151.python.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ void wrapSection_32_151( python::module& module, python::module& viewmodule ) {
6767
using IsotopeRange = RandomAccessAnyView< Isotope >;
6868
using ShortRangeBreitWignerBlock = Section::ShortRangeBreitWignerBlock;
6969
using LongRangeCovarianceBlock = Section::LongRangeCovarianceBlock;
70-
using ShortRangeBreitWignerBlockRange = RandomAccessAnyView< ShortRangeBreitWignerBlock >;
71-
using LongRangeCovarianceBlockRange = RandomAccessAnyView< LongRangeCovarianceBlock >;
7270

7371
// create the submodule
7472
python::module submodule = module.def_submodule(

python/src/section/32/151/GeneralMultiLevelBreitWigner.python.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace python = pybind11;
1111

1212
namespace mf32 {
1313

14-
void wrapGeneralMultiLevelBreitWigner( python::module& module, python::module& viewmodule ) {
14+
void wrapGeneralMultiLevelBreitWigner( python::module& module, python::module& ) {
1515

1616
// type aliases
1717
using Section = njoy::ENDFtk::section::Type< 32, 151 >;

0 commit comments

Comments
 (0)