Skip to content

C++11 range-based for loop 対応 (CProfile) #2124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2025
+8 −8
Merged

C++11 range-based for loop 対応 (CProfile) #2124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions sakura_core/CProfile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,12 +230,12 @@ bool CProfile::WriteProfile(
vecLine.emplace_back( L";" + std::wstring( pszComment ) ); // //->; 2008/5/24 Uchi
vecLine.push_back( LTEXT("") );
}
for(auto iter = m_ProfileData.cbegin(); iter != m_ProfileData.cend(); iter++ ) {
for(const auto& iter : m_ProfileData) {
Copy link
Contributor

@beru beru Nov 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

変更後はこの変数は iterator ではないと思うのでちょっと変数名に違和感があります。まぁ細かい事を言い出すときりが無いですが。

Copy link
Contributor

@berryzplus berryzplus Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

マジメにネーミングすると seciton ですね。

プロファイル
┗セクション1
　┣キー1　＝　値1
　┣キー2　＝　値2
　┗キー3　＝　値3

という構造。セクションは配列（vector）、セクション内のkey-valueはマップ（map）なので
線形イテレーターの iter 、マップイテレーターの mapIter という変数名にしたものと思われます。

//セクション名を書き込む
vecLine.push_back( LTEXT("[") + iter->strSectionName + LTEXT("]") );
for(auto mapiter = iter->mapEntries.cbegin(); mapiter != iter->mapEntries.cend(); mapiter++ ) {
vecLine.emplace_back( L"[" + iter.strSectionName + L"]" );
for(const auto& mapiter : iter.mapEntries) {
//エントリを書き込む
vecLine.push_back( mapiter->first + LTEXT("=") + mapiter->second );
vecLine.emplace_back( mapiter.first + L"=" + mapiter.second );
}
vecLine.push_back( LTEXT("") );
}
Expand Down Expand Up @@ -354,10 +354,10 @@ void CProfile::DUMP( void )
#ifdef _DEBUG
// 2006.02.20 ryoji: MAP_STR_STR_ITER削除時の修正漏れによるコンパイルエラー修正
MYTRACE( L"\n\nCProfile::DUMP()======================" );
for(auto iter = m_ProfileData.cbegin(); iter != m_ProfileData.cend(); iter++ ) {
MYTRACE( L"\n■strSectionName=%ls", iter->strSectionName.c_str() );
for(auto mapiter = iter->mapEntries.cbegin(); mapiter != iter->mapEntries.cend(); mapiter++ ) {
MYTRACE( L"\"%ls\" = \"%ls\"\n", mapiter->first.c_str(), mapiter->second.c_str() );
for(const auto& iter : m_ProfileData) {
MYTRACE( L"\n■strSectionName=%ls", iter.strSectionName.c_str() );
for(const auto& mapiter : iter.mapEntries) {
MYTRACE( L"\"%ls\" = \"%ls\"\n", mapiter.first.c_str(), mapiter.second.c_str() );
Copy link
Contributor

@berryzplus berryzplus Oct 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

引っかかる余地があるのはここだけと思いますが、C++11対応をうたっているので問題なしと思います。
（「mapのkey-value列挙にはC++17の構造化束縛を使おう」の指摘はあり得る。）

}
}
MYTRACE( L"========================================\n" );
Expand Down
Loading