alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: attempt to avoid some libc++ problems

Browse Source 
Seems there are problems compiling mu with XCode 11.6 (see build tests);
apparently because of libc++ being different from libstdc++.

clang++ builds works fine as long as we're using libstdc++.
This commit is contained in:
Dirk-Jan C. Binnema
2020-07-26 11:56:25 +03:00
parent 688e0a9e8b
commit 3691e28316
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/utils/mu-command-parser.cc
View File

@ -53,7 +53,7 @@ Command::invoke(const Command::CommandMap& cmap, const Sexp& call)
// calls used keyword-parameters, e.g. // calls used keyword-parameters, e.g.
// (my-function :bar 1 :cuux "fnorb") // (my-function :bar 1 :cuux "fnorb")
// so, we're looking for the odd-numbered parameters. // so, we're looking for the odd-numbered parameters.
const auto param_it = [&]() { const auto param_it = [&]()->Sexp::Seq::const_iterator {
for (size_t i = 1; i < params.size(); i += 2) for (size_t i = 1; i < params.size(); i += 2)
if (params.at(i).is_symbol() && params.at(i).value() == argname) if (params.at(i).is_symbol() && params.at(i).value() == argname)
return params.begin() + i + 1; return params.begin() + i + 1;
@ -94,7 +94,7 @@ Command::invoke(const Command::CommandMap& cmap, const Sexp& call)
cinfo.handler(params); cinfo.handler(params);
} }
static auto static Sexp::Seq::const_iterator
find_param_node (const Parameters& params, const std::string& argname) find_param_node (const Parameters& params, const std::string& argname)
{ {
if (params.empty()) if (params.empty())

3
lib/utils/mu-sexp.hh
View File

@ -306,7 +306,8 @@ private:
static bool is_prop_list (Seq::const_iterator b, Seq::const_iterator e) { static bool is_prop_list (Seq::const_iterator b, Seq::const_iterator e) {
while (b != e) { while (b != e) {
if (!is_prop_name(*b)) const Sexp& s{*b};
if (!is_prop_name(s))
return false; return false;
if (++b == e) if (++b == e)
return false; return false;