diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-12-19 11:25:11 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-12-19 11:25:11 +0200 |
| commit | 6ae9675fc04af104ef995f571d05300f18a9363d (patch) | |
| tree | 4600adcba7080b9b6557cfe8bb2720527972cd8b | |
| parent | 0cbd2d1d03ff96eb668fc6a14311d96ed0f9f8b5 (diff) | |
Fix clash of info variables in main()
| -rw-r--r-- | build2/b.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build2/b.cxx b/build2/b.cxx index 2f94bbc..1d6f231 100644 --- a/build2/b.cxx +++ b/build2/b.cxx @@ -476,13 +476,13 @@ main (int argc, char* argv[]) // Note: omit reserving anything for the info meta-operation since it // won't be loading the buildfiles and needs to be as fast as possible. // - bool info (bspec.size () == 1 && - bspec.front ().size () == 1 && - (bspec.front ().name == "info" || - (bspec.front ().name.empty () && - bspec.front ().front ().name == "info"))); + bool mo_info (bspec.size () == 1 && + bspec.front ().size () == 1 && + (bspec.front ().name == "info" || + (bspec.front ().name.empty () && + bspec.front ().front ().name == "info"))); - if (!info) + if (!mo_info) pctx->reserve (context::reserves { 30000 /* targets */, 1100 /* variables */}); @@ -901,7 +901,7 @@ main (int argc, char* argv[]) bootstrap_pre (rs, altn); bootstrap_src (rs, altn, nullopt /* amalgamation */, - !info || info_subprojects (mparams) /*subprojects*/); + !mo_info || info_subprojects (mparams) /*subprojects*/); // If this is a simple project, then implicitly load the test and // install modules. |