diff options
author | Brad King <brad.king@kitware.com> | 2015-02-24 20:43:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-02-25 13:41:56 (GMT) |
commit | 798eeb5e1c15251ab4f82dc754f6ef62d455f746 (patch) | |
tree | a06c4a9d3f6c09b991b7940efe3bee5e45f67196 /src | |
parent | 5c8a1e735f8ff5f4b02e220033f72177a69467e4 (diff) | |
download | CastXML-798eeb5e1c15251ab4f82dc754f6ef62d455f746.zip CastXML-798eeb5e1c15251ab4f82dc754f6ef62d455f746.tar.gz CastXML-798eeb5e1c15251ab4f82dc754f6ef62d455f746.tar.bz2 |
Detect: Use local variable to simplify fixPredefines logic
Diffstat (limited to 'src')
-rw-r--r-- | src/Detect.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Detect.cxx b/src/Detect.cxx index 100cba8..70b6a74 100644 --- a/src/Detect.cxx +++ b/src/Detect.cxx @@ -56,14 +56,15 @@ static bool failedCC(const char* id, static void fixPredefines(Options& opts) { // Remove any detected conflicting definition of a Clang builtin macro. + std::string& pd = opts.Predefines; std::string::size_type beg = 0; - while ((beg = opts.Predefines.find("#define __has", beg), + while ((beg = pd.find("#define __has", beg), beg != std::string::npos)) { - std::string::size_type end = opts.Predefines.find('\n', beg); + std::string::size_type end = pd.find('\n', beg); if (end != std::string::npos) { - opts.Predefines.erase(beg, end+1 - beg); + pd.erase(beg, end+1 - beg); } else { - opts.Predefines.erase(beg); + pd.erase(beg); } } } |