From 11cf896226cfee7bfa95d46de8186b5137f930ed Mon Sep 17 00:00:00 2001
From: Anton Piccardo-Selg <anton.piccardo-selg@tessella.com>
Date: Fri, 17 Jun 2016 14:02:33 +0100
Subject: [PATCH] Refs #15283 add dllconfig
---
Framework/ScriptRepository/CMakeLists.txt | 1 +
.../inc/MantidScriptRepository/DllConfig.h | 22 +++++++++++++++++++
.../ScriptRepositoryImpl.h | 17 ++------------
3 files changed, 25 insertions(+), 15 deletions(-)
create mode 100644 Framework/ScriptRepository/inc/MantidScriptRepository/DllConfig.h
diff --git a/Framework/ScriptRepository/CMakeLists.txt b/Framework/ScriptRepository/CMakeLists.txt
index f16cbbf784a..c2bc2704c92 100644
--- a/Framework/ScriptRepository/CMakeLists.txt
+++ b/Framework/ScriptRepository/CMakeLists.txt
@@ -4,6 +4,7 @@ set ( SRC_FILES
)
set ( INC_FILES
+ inc/MantidScriptRepository/DllConfig.h
inc/MantidScriptRepository/ScriptRepositoryImpl.h
)
diff --git a/Framework/ScriptRepository/inc/MantidScriptRepository/DllConfig.h b/Framework/ScriptRepository/inc/MantidScriptRepository/DllConfig.h
new file mode 100644
index 00000000000..4f13d0ab515
--- /dev/null
+++ b/Framework/ScriptRepository/inc/MantidScriptRepository/DllConfig.h
@@ -0,0 +1,22 @@
+#ifndef MANTID_MANTIDSCRIPTREPOSITORY_DLLCONFIG_H_
+#define MANTID_MANTIDSCRIPTREPOSITORY_DLLCONFIG_H_
+
+#include "MantidKernel/System.h"
+
+#ifdef _WIN32
+#if (IN_MANTID_SCRIPTREPO)
+#define SCRIPT_DLL_EXPORT DLLExport
+#else
+#define SCRIPT_DLL_EXPORT DLLImport
+#endif
+#elif defined(__GNUC__) && !defined(__clang__)
+#if (IN_MANTID_SCRIPTREPO)
+#define SCRIPT_DLL_EXPORT DLLExport
+#else
+#define SCRIPT_DLL_EXPORT DLLImport
+#endif
+#else
+#define SCRIPT_DLL_EXPORT
+#endif
+
+#endif // MANTID_DATAOBJECTS_DLLCONFIG_H_
diff --git a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
index ac9d73e6023..3065ebdb9c3 100644
--- a/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
+++ b/Framework/ScriptRepository/inc/MantidScriptRepository/ScriptRepositoryImpl.h
@@ -3,24 +3,11 @@
#include "MantidAPI/ScriptRepository.h"
#include "MantidKernel/DateAndTime.h"
+#include "MantidScriptRepository/DllConfig.h"
#include <map>
#include <json/value.h>
-#ifdef _WIN32
-#if (IN_MANTID_SCRIPTREPO)
-#define SCRIPT_DLL_EXPORT DLLExport
-#else
-#define SCRIPT_DLL_EXPORT DLLImport
-#endif
-#elif defined(__GNUC__) && !defined(__clang__)
-#if (IN_MANTID_SCRIPTREPO)
-#define SCRIPT_DLL_EXPORT DLLExport
-#else
-#define SCRIPT_DLL_EXPORT DLLImport
-#endif
-#else
-#define SCRIPT_DLL_EXPORT
-#endif
+
namespace Mantid {
namespace API {
--
GitLab