diff --git a/Framework/Kernel/test/UserCatalogInfoTest.h b/Framework/Kernel/test/UserCatalogInfoTest.h index 63d8619ec28bb29db1d2ae85d721c836d2a4c8eb..cbba1a2c91341d8fa5046e0624248443148dd804 100644 --- a/Framework/Kernel/test/UserCatalogInfoTest.h +++ b/Framework/Kernel/test/UserCatalogInfoTest.h @@ -38,6 +38,11 @@ public: virtual ~MockICatalogInfo() {} }; +// Adaptee +struct UserType { + std::string getString(const std::string &) const { return "my_value"; } +}; + class UserCatalogInfoTest : public CxxTest::TestSuite { public: // This pair of boilerplate methods prevent the suite being created statically @@ -173,12 +178,6 @@ public: } void test_auto_adapter() { - - // Adaptee - struct UserType { - std::string getString(const std::string &) const { return "my_value"; } - }; - UserType usertype; CatalogConfigService *service = makeCatalogConfigServiceAdapter(usertype, std::string("my_key")); diff --git a/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp b/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp index 8ad314475c6ee42384255384816fd5ffd6226189..f030bbc039b48d6c7c0d89eb3576ab8fefd02d9e 100644 --- a/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp +++ b/MantidQt/CustomInterfaces/src/ReflMainViewPresenter.cpp @@ -1512,7 +1512,7 @@ void ReflMainViewPresenter::transfer() { } ReflProgress progress(0, static_cast<double>(selectedRows.size()), - static_cast<double>(selectedRows.size()), + static_cast<int64_t>(selectedRows.size()), this->m_progressView); auto newRows = getTransferStrategy()->transferRuns(runs, progress);