Import Geant4 11.3.1 source tree
This commit is contained in:
@@ -38,7 +38,7 @@ G4AccArray<T, N>::G4AccArray(
|
||||
const G4String& name, const T& value, G4MergeMode mergeMode)
|
||||
: G4VAccumulable(name, mergeMode),
|
||||
fInitValue(value),
|
||||
fMergeFunction(GetMergeFunction<T>(mergeMode))
|
||||
fMergeFunction(G4Accumulables::GetMergeFunction<T>(mergeMode))
|
||||
{
|
||||
if (G4Accumulables::VerboseLevel > 1 ) {
|
||||
G4cout << "G4AccArray ctor1" << G4endl;
|
||||
@@ -54,7 +54,7 @@ template <class T, std::size_t N>
|
||||
template <typename... Args>
|
||||
G4AccArray<T, N>::G4AccArray(Args&&... args)
|
||||
: G4VAccumulable(),
|
||||
fArray{{std::forward<Args>(args)...}}, fMergeFunction(GetMergeFunction<T>(fMergeMode))
|
||||
fArray{{std::forward<Args>(args)...}}, fMergeFunction(G4Accumulables::GetMergeFunction<T>(fMergeMode))
|
||||
{
|
||||
if (G4Accumulables::VerboseLevel > 1 ) {
|
||||
G4cout << "G4AccArray ctor2" << G4endl;
|
||||
@@ -67,7 +67,7 @@ template <typename First, typename... Args>
|
||||
G4AccArray<T, N>::G4AccArray(const First& firstArg, Args&&... args)
|
||||
: G4VAccumulable(firstArg),
|
||||
fArray{{std::forward<Args>(args)...}},
|
||||
fMergeFunction(GetMergeFunction<T>(fMergeMode))
|
||||
fMergeFunction(G4Accumulables::GetMergeFunction<T>(fMergeMode))
|
||||
{
|
||||
if (G4Accumulables::VerboseLevel > 1 ) {
|
||||
G4cout << "G4AccArray ctor3" << G4endl;
|
||||
@@ -136,7 +136,7 @@ template <class T, std::size_t N>
|
||||
void G4AccArray<T, N>::SetMergeMode(G4MergeMode value)
|
||||
{
|
||||
G4VAccumulable::SetMergeMode(value);
|
||||
fMergeFunction = GetMergeFunction<T>(value);
|
||||
fMergeFunction = G4Accumulables::GetMergeFunction<T>(value);
|
||||
}
|
||||
|
||||
//_____________________________________________________________________________
|
||||
|
||||
Reference in New Issue
Block a user