Skip to content
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

Jump to bottom

Root: Rename local variable to avoid shadow function #879

Merged
merged 1 commit into from Dec 18, 2021
Merged

Root: Rename local variable to avoid shadow function #879

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/dbtree/root.cpp
View file
Open in desktop
Expand Up @@ -703,15 +703,15 @@ bool Root::set_board( const std::string& url, const std::string& name, const std

// 移転チェック
BoardBase* board = nullptr;
const int stat = is_moved( root, path_board, name, &board, etc );
const int state = is_moved( root, path_board, name, &board, etc );

#ifdef _SHOW_BOARD
std::cout << "root = " << root << " path_board = " << path_board
<< " basicauth = " << basicauth <<" type = " << type << " stat = " << stat << std::endl;
<< " basicauth = " << basicauth <<" type = " << type << " state = " << state << std::endl;
#endif

// 新板登録
if( stat == BOARD_NEW ){
if( state == BOARD_NEW ){

auto uniq = DBTREE::BoardFactory( type, root, path_board, name, basicauth );
if( uniq ){
Expand All @@ -722,7 +722,7 @@ bool Root::set_board( const std::string& url, const std::string& name, const std
}

// 移転処理
else if( stat == BOARD_MOVED ){
else if( state == BOARD_MOVED ){

// XML解析中に、
// <board name="ニュース実況+" url="http://anchorage.2ch.net/liveplus/" />
Expand Down