Refs #8506. Attempt to fix namespace issues on Windows.

mantidproject · Nov 26, 2013 · 148053b · 148053b
1 parent bf07d2e
commit 148053b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadMuonNexus1.h
@@ -8,15 +8,20 @@
 #include "MantidDataObjects/TableWorkspace.h"
 #include "MantidDataObjects/Workspace2D.h"
 #include "MantidKernel/System.h"
-#include "MantidNexus/NexusClasses.h"
 
-//----------------------------------------------------------------------
-// Forward declaration
-//----------------------------------------------------------------------
+// Forward declaration (here, because is not in Mantid namespace)
 class MuonNexusReader;
 
 namespace Mantid
 {
+  //----------------------------------------------------------------------
+  // Forward declaration
+  //----------------------------------------------------------------------
+  namespace NeXus
+  {
+    class NXRoot;
+  }
+
   namespace DataHandling
   {
     using namespace DataObjects;

diff --git a/Code/Mantid/Framework/DataHandling/test/ApplyGroupingFromMuonNexusTest.h b/Code/Mantid/Framework/DataHandling/test/ApplyGroupingFromMuonNexusTest.h
@@ -11,7 +11,6 @@
 
 #include <numeric> // std::accumulate
 
-using namespace Mantid;
 using namespace Mantid::API;
 using namespace Mantid::Kernel;
 using namespace Mantid::DataHandling;
@@ -150,4 +149,4 @@ class ApplyGroupingFromMuonNexusTest : public CxxTest::TestSuite
 };
 
 
-#endif /* MANTID_DATAHANDLING_ApplyGroupingFromMuonNexusTEST_H_ */
+#endif /* MANTID_DATAHANDLING_ApplyGroupingFromMuonNexusTEST_H_ */