fix(unity): fixed name conflict in unity builds
getSpecies was defined in two translation units. This was not an issue for regular builds but broke unity builds. this has been refactored to a single function in utils.h
This commit is contained in:
@@ -14,13 +14,6 @@
|
||||
#include "quill/LogMacros.h"
|
||||
|
||||
namespace {
|
||||
std::optional<fourdst::atomic::Species> getSpecies(const std::string& symbol) {
|
||||
if (!fourdst::atomic::species.contains(symbol)) {
|
||||
return std::nullopt;
|
||||
}
|
||||
return fourdst::atomic::species.at(symbol);
|
||||
}
|
||||
|
||||
quill::Logger* getLogger() {
|
||||
static quill::Logger* logger = fourdst::logging::LogManager::getInstance().getLogger("log");
|
||||
return logger;
|
||||
@@ -193,4 +186,11 @@ namespace fourdst::composition {
|
||||
return buildCompositionFromMassFractions(species, massFractionVector);
|
||||
}
|
||||
|
||||
std::optional<fourdst::atomic::Species> getSpecies(const std::string& symbol) {
|
||||
if (!fourdst::atomic::species.contains(symbol)) {
|
||||
return std::nullopt;
|
||||
}
|
||||
return fourdst::atomic::species.at(symbol);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user