Skip to content

Commit f1a5f89

Browse files
authored
Merge pull request #1146 from n-kawauchi/gcc13_support
Ubuntu24.04環境でのビルドエラー対応
2 parents 6f0ba13 + 5191fc8 commit f1a5f89

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ function(openrtm_common_set_compile_options target)
688688
-Wstrict-null-sentinel
689689
-Wstrict-overflow=5
690690
$<$<VERSION_GREATER:${CMAKE_CXX_COMPILER_VERSION},6.9.9>: -Wstringop-overflow=4>
691-
$<$<VERSION_GREATER:${CMAKE_CXX_COMPILER_VERSION},12.9.9>: -Wsuggest-attribute=cold>
691+
$<$<VERSION_GREATER:${CMAKE_CXX_COMPILER_VERSION},13.9.9>: -Wsuggest-attribute=cold>
692692
-Wsuggest-attribute=format
693693
$<$<VERSION_GREATER:${CMAKE_CXX_COMPILER_VERSION},7.9.9>: -Wsuggest-attribute=malloc>
694694
$<$<VERSION_GREATER:${CMAKE_CXX_COMPILER_VERSION},4.9.9>: -Wsuggest-override>

src/lib/rtm/Manager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@ std::vector<coil::Properties> Manager::getLoadableModules()
12281228

12291229
for (auto const& itr : coil::split(m_config["manager.preload.modules"], ","))
12301230
{
1231-
std::string mpm_{coil::eraseBothEndsBlank(std::move(itr))};
1231+
std::string mpm_{coil::eraseBothEndsBlank(itr)};
12321232
if (mpm_.empty())
12331233
{
12341234
continue;

0 commit comments

Comments
 (0)