Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/ci-conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ jobs:
#!/bin/bash -v
set -eu
cd /mnt/source
pip install conan --upgrade
rm -rf ~/.conan2
pip install --user --upgrade conan~=2.22
conan profile detect --force
conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
REFNAME="${GITHUB_REF#refs/*/}"
VERSION="v$(<version.txt)"
Expand Down
3 changes: 2 additions & 1 deletion src/cosim/fmi/v1/fmu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@ void log_message(
break;
}
BOOST_LOG_SEV(log::logger(), logLevel)
<< "[FMI status=" << statusName << ", category=" << category << "] "
<< "[FMI status=" << statusName
<< ", category=" << (category ? category : "") << "] "
<< msgBuffer.data();

g_logMutex.lock();
Expand Down
3 changes: 2 additions & 1 deletion src/cosim/fmi/v2/fmu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,8 @@ void log_message(
break;
}
BOOST_LOG_SEV(log::logger(), logLevel)
<< "[FMI status=" << statusName << ", category=" << category << "] "
<< "[FMI status=" << statusName
<< ", category=" << (category ? category : "") << "] "
<< msgBuffer.data();

g_logMutex.lock();
Expand Down
Loading