Skip to content
Snippets Groups Projects
Commit 8d5119aa authored by Norihiro Watanabe's avatar Norihiro Watanabe
Browse files

Merge pull request #1223 from norihiro-w/fix-cmake

small fixes
parents 45d8c414 c2023c69
No related branches found
No related tags found
No related merge requests found
# Source files
set(LIB_SOURCES ProjectData.cpp)
GET_SOURCE_FILES(SOURCES_APPLICATIONSLIB)
set(LIB_SOURCES ${SOURCES_APPLICATIONSLIB})
# Library
add_library(ApplicationsLib ${LIB_SOURCES})
......
......@@ -30,7 +30,7 @@ public:
{
LOGOG_INITIALIZE();
logog_cout = std::unique_ptr<logog::Cout>(new logog::Cout);
SetFormatter(std::unique_ptr<BaseLib::LogogSimpleFormatter>
setFormatter(std::unique_ptr<BaseLib::LogogSimpleFormatter>
(new BaseLib::LogogSimpleFormatter));
}
......@@ -42,18 +42,18 @@ public:
LOGOG_SHUTDOWN();
}
void SetFormatter(std::unique_ptr<logog::Formatter>&& formatter)
void setFormatter(std::unique_ptr<logog::Formatter>&& formatter)
{
fmt = std::move(formatter);
logog_cout->SetFormatter(*fmt);
}
void SetLevel(LOGOG_LEVEL_TYPE level)
void setLevel(LOGOG_LEVEL_TYPE level)
{
logog::SetDefaultLevel(level);
}
void SetLevel(std::string const & level)
void setLevel(std::string const & level)
{
std::map<std::string, LOGOG_LEVEL_TYPE> foo =
{
......@@ -71,7 +71,7 @@ public:
//LOGOG_LEVEL_TYPE level_type;
if(foo.find(level) != foo.end())
SetLevel(foo[level]);
setLevel(foo[level]);
else
{
ERR("%s is not a valid log level! Aborting.", level.c_str());
......
......@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
ApplicationsLib::LogogSetup logog_setup;
logog_setup.SetLevel(log_level_arg.getValue());
logog_setup.setLevel(log_level_arg.getValue());
ApplicationsLib::LinearSolverLibrarySetup linear_solver_library_setup(
argc, argv);
......
......@@ -57,11 +57,11 @@ int main(int argc, char* argv[])
ApplicationsLib::LinearSolverLibrarySetup linear_solver_library_setup(
argc, argv);
logog_setup.SetFormatter(std::unique_ptr<BaseLib::TemplateLogogFormatterSuppressedGCC
logog_setup.setFormatter(std::unique_ptr<BaseLib::TemplateLogogFormatterSuppressedGCC
<TOPIC_LEVEL_FLAG | TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG> >
(new BaseLib::TemplateLogogFormatterSuppressedGCC
<TOPIC_LEVEL_FLAG | TOPIC_FILE_NAME_FLAG | TOPIC_LINE_NUMBER_FLAG>()));
logog_setup.SetLevel(logLevel);
logog_setup.setLevel(logLevel);
try
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment