From 1572f2a73c2ce3fc9b5859b60793683ce965f207 Mon Sep 17 00:00:00 2001
From: Bhuvan Bezawada <bhuvan_777@outlook.com>
Date: Tue, 7 Aug 2018 13:48:13 +0100
Subject: [PATCH] Minor changes to iterator file
re #23145
---
.../Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h | 3 ++-
.../inc/MantidGeometry/Instrument/DetectorInfoIterator.h | 2 +-
.../test/python/mantid/geometry/DetectorInfoTest.py | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
index 1776e458616..f60ce0a1657 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
@@ -1,10 +1,11 @@
#ifndef MANTID_GEOMETRY_DETECTORINFOITEM_H_
#define MANTID_GEOMETRY_DETECTORINFOITEM_H_
+#include <utility>
+
#include "MantidGeometry/Instrument/DetectorInfo.h"
#include "MantidKernel/V3D.h"
-#include <utility>
using Mantid::Kernel::V3D;
namespace Mantid {
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
index 7bdf19eabd2..af60badcce4 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
@@ -15,7 +15,7 @@ class DetectorInfo;
class MANTID_GEOMETRY_DLL DetectorInfoIterator
: public boost::iterator_facade<DetectorInfoIterator,
const DetectorInfoItem &,
- boost::bidirectional_traversal_tag> {
+ boost::forward_traversal_tag> {
public:
DetectorInfoIterator(const DetectorInfo &detectorInfo, const size_t index)
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
index 751b323bd2d..7485e9ee3cb 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
@@ -107,8 +107,8 @@ class DetectorInfoTest(unittest.TestCase):
"""
def test_iteration(self):
- import time
- time.sleep(20)
+ #import time
+ #time.sleep(20)
info = self._ws.detectorInfo()
#self.assertEquals(len(info), 0)
#self.assertEquals(info.size(), 0)
--
GitLab