Skip to content

Commit

Permalink
Fixed osx build. Refs #9244.
Browse files Browse the repository at this point in the history
  • Loading branch information
wdzhou committed Apr 3, 2014
1 parent 4512b4a commit 5473d4e
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Code/Mantid/Framework/Kernel/src/TimeSeriesProperty.cpp
Expand Up @@ -8,10 +8,8 @@
#include <sstream>
#if !(defined __APPLE__ && defined __INTEL_COMPILER)
#include <algorithm>
using std::is_sorted;
#else
#include <boost/range/algorithm_ext/is_sorted.hpp>
using boost::is_sorted;
#endif

using namespace std;
Expand Down Expand Up @@ -1816,7 +1814,11 @@ namespace Mantid
if (m_propSortedFlag == TimeSeriesSortStatus::TSUNKNOWN)
{
// Check whether it is sorted or not
#if !(defined __APPLE__ && defined __INTEL_COMPILER)
bool sorted = is_sorted(m_values.begin(), m_values.end());
#else
bool sorted = boost::is_sorted(m_values);
#endif
if (sorted)
m_propSortedFlag = TimeSeriesSortStatus::TSSORTED;
else
Expand Down

0 comments on commit 5473d4e

Please sign in to comment.