diff --git a/Fit/Minimizer/MultiOption.h b/Fit/Minimizer/MultiOption.h index 36f16756bb5323dc37a269af1b57f4d51ea0fb47..a622efe24ea8012830c1912f0f5e4383c19d21ce 100644 --- a/Fit/Minimizer/MultiOption.h +++ b/Fit/Minimizer/MultiOption.h @@ -25,7 +25,7 @@ //! @brief The MultiOption class is intended to store a single option for minimization //! algorithm. Int, double, string values are available. //! Relies on boost::variant, will be switched to std::variant in C++-17. -//! (before was https://github.com/mapbox/variant). +//! (before was https://github.com/mapbox/variant. class BA_CORE_API_ MultiOption { diff --git a/GUI/coregui/utils/GUIHelpers.cpp b/GUI/coregui/utils/GUIHelpers.cpp index c4a35a0b1112126e2af7ad3626624272eef0289f..6aafbf4bf76dc9cb5c07942b346ac676440bbeb5 100644 --- a/GUI/coregui/utils/GUIHelpers.cpp +++ b/GUI/coregui/utils/GUIHelpers.cpp @@ -230,5 +230,14 @@ QVector<double> fromStdVector(const std::vector<double> &data) return result; } +QStringList fromStdStrings(const std::vector<std::string> &container) +{ + QStringList result; + for(std::string str : container) { + result.append(QString::fromStdString(str)); + } + return result; +} + } // namespace GUIHelpers diff --git a/GUI/coregui/utils/GUIHelpers.h b/GUI/coregui/utils/GUIHelpers.h index 095fd7bf6c96b7b4a25a859426c2da98b30adfbe..3ae3cb38aea6f8aef222f2f7391d59f5a6827b13 100644 --- a/GUI/coregui/utils/GUIHelpers.h +++ b/GUI/coregui/utils/GUIHelpers.h @@ -69,15 +69,7 @@ BA_CORE_API_ bool isVersionMatchMinimal(const QString &version, const QString &m BA_CORE_API_ QString currentDateTime(); -template<class T> -BA_CORE_API_ QStringList fromStdStrings(const T &container) -{ - QStringList result; - for(std::string str : container) { - result.append(QString::fromStdString(str)); - } - return result; -} +BA_CORE_API_ QStringList fromStdStrings(const std::vector<std::string> &container); BA_CORE_API_ QVector<double> fromStdVector(const std::vector<double> &data); diff --git a/Tests/UnitTests/Fit/CMakeLists.txt b/Tests/UnitTests/Fit/CMakeLists.txt index af8ef7fbd617147460a43bf45a7e90ca2fdc049e..048d75e17a4876caad1627a4ceef17884f05ec21 100644 --- a/Tests/UnitTests/Fit/CMakeLists.txt +++ b/Tests/UnitTests/Fit/CMakeLists.txt @@ -8,6 +8,7 @@ include_directories( ${BornAgainCore_INCLUDE_DIRS} ${BornAgainFit_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} ${RootMinimizers_INCLUDE_DIRS} ${gtest_SOURCE_DIR} ${gtest_SOURCE_DIR}/include