Fix unix issues. Refs #9026.

- Added missing DLL include. - Revert to forward declaration of `CatalogSearchParam`.
mantidproject · Feb 20, 2014 · d5b8673 · d5b8673
1 parent 0a6469d
commit d5b8673
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ICatalog.h b/Code/Mantid/Framework/API/inc/MantidAPI/ICatalog.h
@@ -1,11 +1,17 @@
 #ifndef MANTID_API_ICATLOG_H_
 #define MANTID_API_ICATLOG_H_
+
 #include "MantidAPI/ITableWorkspace.h"
-#include "MantidICat/CatalogSearchParam.h"
 
 namespace Mantid
 {
 
+//forward declarations
+namespace ICat
+{
+  class CatalogSearchParam;
+}
+
 namespace API
 {
 

diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/CatalogSearchParam.h b/Code/Mantid/Framework/ICat/inc/MantidICat/CatalogSearchParam.h
@@ -4,6 +4,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "MantidAPI/DllConfig.h"
+
 namespace Mantid
 {
   namespace ICat

diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h
@@ -4,6 +4,7 @@
 #include "MantidAPI/ICatalog.h"
 #include "MantidICat/ICat3/ICat3ErrorHandling.h"
 #include "MantidICat/ICat3/ICat3Helper.h"
+#include "MantidICat/CatalogSearchParam.h"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
@@ -4,6 +4,7 @@
 #include "MantidAPI/ICatalog.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidKernel/Logger.h"
+#include "MantidICat/CatalogSearchParam.h"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/ICat/test/CompositeCatalogTest.h b/Code/Mantid/Framework/ICat/test/CompositeCatalogTest.h
@@ -3,6 +3,7 @@
 
 #include <cxxtest/TestSuite.h>
 
+#include "MantidICat/CatalogSearchParam.h"
 #include "MantidICat/CompositeCatalog.h"
 
 #include <boost/make_shared.hpp>