Skip to content

Commit 7953a05

Browse files
committed
Merge branch '1-add-gcc-versions-from-7-3-9-3-to-ci' into 'develop'
Resolve "Add gcc versions from 7.3-9.3 to ci" See merge request njoy/dryad!25
2 parents 1b90ec1 + 9a13786 commit 7953a05

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/dryad/format/ace/electroatomic/createTabulatedCrossSections.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ namespace electroatomic {
7878

7979
// elastic deficit
8080
std::vector< double > deficit = xs[3].values();
81-
std::transform( deficit.begin(), deficit.end(), xs[2].values().begin(), deficit.begin(), std::minus() );
81+
std::transform( deficit.begin(), deficit.end(), xs[2].values().begin(), deficit.begin(), std::minus<>() );
8282
xs.emplace_back( energies, std::move( deficit ) );
8383
}
8484
}

src/dryad/format/ace/photoatomic/createTabulatedCrossSections.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ namespace photoatomic {
4949
// coherent scattering - MT504
5050
auto incoherent = createVector( table.principalCrossSectionBlock().incoherent() );
5151
std::transform( incoherent.begin(), incoherent.end(), incoherent.begin(), convertValue );
52-
std::transform( incoherent.begin(), incoherent.end(), total.begin(), total.begin(), std::plus() );
52+
std::transform( incoherent.begin(), incoherent.end(), total.begin(), total.begin(), std::plus<>() );
5353
xs.emplace_back( energies, std::move( incoherent ) );
5454

5555
// pair production - MT516 (sum of MT515 and MT517)
5656
auto pair = createVector( table.principalCrossSectionBlock().pairproduction() );
5757
std::transform( pair.begin(), pair.end(), pair.begin(), convertValue );
58-
std::transform( pair.begin(), pair.end(), total.begin(), total.begin(), std::plus() );
58+
std::transform( pair.begin(), pair.end(), total.begin(), total.begin(), std::plus<>() );
5959
xs.emplace_back( energies, std::move( pair ) );
6060

6161
// photoelectric - MT522 (sum of MT534 and up)
6262
auto photoelectric = createVector( table.principalCrossSectionBlock().photoelectric() );
6363
std::transform( photoelectric.begin(), photoelectric.end(), photoelectric.begin(), convertValue );
64-
std::transform( photoelectric.begin(), photoelectric.end(), total.begin(), total.begin(), std::plus() );
64+
std::transform( photoelectric.begin(), photoelectric.end(), total.begin(), total.begin(), std::plus<>() );
6565
xs.emplace_back( energies, std::move( photoelectric ) );
6666

6767
// total - MT501

0 commit comments

Comments
 (0)