make macos happy

pull/405/head
Jeff 5 years ago
parent 136a01391e
commit 4c611ea935

@ -28,7 +28,7 @@ namespace abyss
if(ShouldProcessHeader(string_view(lowerHeader)))
{
val = val.substr(val.find_first_not_of(' '));
Header.Headers.insert(std::make_pair(lowerHeader, val));
Header.Headers.emplace(lowerHeader.c_str(), llarp::string_view_string(val));
}
return true;
}

@ -22,7 +22,7 @@ namespace llarp
[&ret](const ConfigParser::Section_t &s) -> bool {
for(const auto &item : s)
{
ret.emplace_back(item.first, item.second);
ret.emplace_back(string_view_string(item.first), string_view_string(item.second));
}
return true;
}))

@ -7,10 +7,10 @@ namespace llarp
namespace iwp
{
std::array< byte_t, 6 > OuterMessage::obtain_flow_id_magic =
std::array< byte_t, 6 >{'n', 'e', 't', 'i', 'd', '?'};
std::array< byte_t, 6 >{{'n', 'e', 't', 'i', 'd', '?'}};
std::array< byte_t, 6 > OuterMessage::give_flow_id_magic =
std::array< byte_t, 6 >{'n', 'e', 't', 'i', 'd', '!'};
std::array< byte_t, 6 >{{'n', 'e', 't', 'i', 'd', '!'}};
OuterMessage::OuterMessage()
{
@ -273,7 +273,7 @@ namespace llarp
LinkLayer::GenFlowIDFor(const PubKey& pk, const Addr& from,
FlowID_t& flow) const
{
std::array< byte_t, 128 > tmp = {0};
std::array< byte_t, 128 > tmp = {{0}};
if(inet_ntop(AF_INET6, from.addr6(), (char*)tmp.data(), tmp.size())
== nullptr)
return false;

@ -17,7 +17,7 @@ namespace llarp
llarp::service::Config::section_t values;
values.first.assign(name.begin(), name.end());
for(const auto& item : section)
values.second.emplace_back(item.first, item.second);
values.second.emplace_back(string_view_string(item.first), string_view_string(item.second));
services.emplace_back(values);
});
return services.size() > 0;

Loading…
Cancel
Save