From f61510f4a25fc19fc9fd8f96a97633fc9c5cb93a Mon Sep 17 00:00:00 2001
From: Sofia Antony <sofia.antony@stfc.ac.uk>
Date: Wed, 31 Mar 2010 15:00:37 +0000
Subject: [PATCH] re #1032 -fix for build failure,
---
Code/Mantid/API/src/AlgorithmHistory.cpp | 1 +
Code/Mantid/Nexus/inc/MantidNexus/LoadNexusProcessed.h | 2 +-
Code/Mantid/Nexus/src/LoadNexusProcessed.cpp | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Code/Mantid/API/src/AlgorithmHistory.cpp b/Code/Mantid/API/src/AlgorithmHistory.cpp
index 44e08cfeedf..e460a81b7ba 100644
--- a/Code/Mantid/API/src/AlgorithmHistory.cpp
+++ b/Code/Mantid/API/src/AlgorithmHistory.cpp
@@ -39,6 +39,7 @@ AlgorithmHistory::~AlgorithmHistory()
\param vers The algorithm version.
\param start The start time of the algorithm execution (optional).
\param duration The time (in seconds) that it took to run this algorithm (optional).
+ \param uexeccount an unsigned int for algorithm execution order
*/
AlgorithmHistory::AlgorithmHistory(const std::string& name, int vers, const dateAndTime& start, const double& duration,unsigned int uexeccount) :
m_name(name),m_version(vers),m_executionDate(start),
diff --git a/Code/Mantid/Nexus/inc/MantidNexus/LoadNexusProcessed.h b/Code/Mantid/Nexus/inc/MantidNexus/LoadNexusProcessed.h
index 86adcf79919..35d15851791 100644
--- a/Code/Mantid/Nexus/inc/MantidNexus/LoadNexusProcessed.h
+++ b/Code/Mantid/Nexus/inc/MantidNexus/LoadNexusProcessed.h
@@ -98,7 +98,7 @@ namespace Mantid
};
/// to sort the algorithmhistory vector
- bool UDlesserExecCount(NXClassInfo& elem1,NXClassInfo &elem2);
+ bool UDlesserExecCount(NXClassInfo elem1,NXClassInfo elem2);
} // namespace NeXus
} // namespace Mantid
diff --git a/Code/Mantid/Nexus/src/LoadNexusProcessed.cpp b/Code/Mantid/Nexus/src/LoadNexusProcessed.cpp
index 72745ecec54..96d6da851a2 100644
--- a/Code/Mantid/Nexus/src/LoadNexusProcessed.cpp
+++ b/Code/Mantid/Nexus/src/LoadNexusProcessed.cpp
@@ -405,7 +405,7 @@ namespace Mantid
* @param elem1 first element in the vector
* @param elem2 second element in the vecor
*/
- bool UDlesserExecCount(NXClassInfo& elem1,NXClassInfo &elem2)
+ bool UDlesserExecCount(NXClassInfo elem1,NXClassInfo elem2)
{
std::basic_string <char>::size_type index1, index2;
@@ -448,7 +448,7 @@ namespace Mantid
//Group will contain a class for each algorithm, called MantidAlgorithm_i and then an
//environment class
//const std::vector<NXClassInfo> & classes = history.groups();
- std::vector<NXClassInfo> classes = history.groups();
+ std::vector<NXClassInfo>& classes = history.groups();
//sort by execution order - to execute the script generated by algorithmhistory in proper order
sort(classes.begin(),classes.end(),UDlesserExecCount);
std::vector<NXClassInfo>::const_iterator iend = classes.end();
--
GitLab